diff --git a/pkg/front_end/test/fasta/testing/suite.dart b/pkg/front_end/test/fasta/testing/suite.dart
index 76fafe0c20e..f9bf3c7eb55 100644
--- a/pkg/front_end/test/fasta/testing/suite.dart
+++ b/pkg/front_end/test/fasta/testing/suite.dart
@@ -128,6 +128,7 @@ import '../../testing_utils.dart' show checkEnvironment;
 import '../../utils/kernel_chain.dart'
     show
         ComponentResult,
+        ErrorCommentChecker,
         MatchContext,
         MatchExpectation,
         Print,
@@ -190,6 +191,10 @@ const String EXPECTATIONS = '''
   {
     "name": "SemiFuzzCrash",
     "group": "Fail"
+  },
+  {
+    "name": "ErrorCommentCheckFailure",
+    "group": "Fail"
   }
 ]
 ''';
@@ -251,6 +256,7 @@ class FastaContext extends ChainContext with MatchContext {
       this.soundNullSafety)
       : steps = <Step>[
           new Outline(compileMode, updateComments: updateComments),
+          new ErrorCommentChecker(compileMode),
           const Print(),
           new Verify(compileMode == CompileMode.full
               ? VerificationStage.afterConstantEvaluation
diff --git a/pkg/front_end/test/spell_checking_list_tests.txt b/pkg/front_end/test/spell_checking_list_tests.txt
index 824a3394ba7..c8650250ee8 100644
--- a/pkg/front_end/test/spell_checking_list_tests.txt
+++ b/pkg/front_end/test/spell_checking_list_tests.txt
@@ -124,6 +124,7 @@ caption
 captions
 carefully
 categorization
+categorize
 causal
 cb
 cc
@@ -442,6 +443,7 @@ kitty
 ko
 koo
 la
+lambdas
 lat
 launch
 launching
@@ -688,6 +690,7 @@ sigint
 signalled
 sigwinch
 silence
+simplistic
 slashes
 slight
 sliver
diff --git a/pkg/front_end/test/utils/kernel_chain.dart b/pkg/front_end/test/utils/kernel_chain.dart
index f351887aca5..3eae788f25b 100644
--- a/pkg/front_end/test/utils/kernel_chain.dart
+++ b/pkg/front_end/test/utils/kernel_chain.dart
@@ -5,8 +5,18 @@
 library fasta.testing.kernel_chain;
 
 import 'dart:async';
+
 import 'dart:io' show Directory, File, IOSink, Platform;
 
+import 'dart:typed_data';
+
+import 'package:_fe_analyzer_shared/src/scanner/abstract_scanner.dart'
+    show ScannerConfiguration;
+import 'package:_fe_analyzer_shared/src/scanner/token.dart';
+
+import 'package:_fe_analyzer_shared/src/scanner/utf8_bytes_scanner.dart'
+    show Utf8BytesScanner;
+
 import 'package:_fe_analyzer_shared/src/util/relativize.dart'
     show isWindows, relativizeUri;
 
@@ -34,6 +44,7 @@ import 'package:kernel/ast.dart'
         Block,
         Component,
         Library,
+        LibraryPart,
         Procedure,
         ReturnStatement,
         Source,
@@ -61,7 +72,8 @@ import 'package:testing/testing.dart'
         Step,
         TestDescription;
 
-import '../fasta/testing/suite.dart' show CompilationSetup;
+import '../fasta/testing/suite.dart' show CompilationSetup, CompileMode;
+
 import '../test_utils.dart';
 
 final Uri platformBinariesLocation = computePlatformBinariesLocation();
@@ -144,6 +156,266 @@ $actual""",
   }
 }
 
+class ErrorCommentChecker
+    extends Step<ComponentResult, ComponentResult, ChainContext> {
+  final CompileMode compileMode;
+  const ErrorCommentChecker(this.compileMode);
+  static const bool throwOnNoMatch = false;
+
+  @override
+  String get name => "ErrorCommentChecker";
+
+  static const Set<String> ignoreBecauseOfFailures = {
+    "extension_types/conflicting_static_and_instance",
+    "extension_types/implements_conflicts",
+    "general/bounds_enums",
+    "general/bounds_type_parameters",
+    "general/covariant_equals",
+    "general/getter_vs_setter_type",
+    "general/nested_variance",
+    "general/nested_variance2",
+    "general/new_as_selector",
+    "general/top_level_variance_test",
+    "general/top_level_variance2",
+    "general/type_variable_uses",
+    "generic_metadata/alias_from_opt_in",
+    "inference/block_bodied_lambdas_infer_bottom_sync",
+    "inference/future_then_conditional",
+    "inference/future_then_ifNull",
+    "inference/generic_methods_infer_js_builtin",
+    "inference/instantiate_to_bounds_generic2_has_bound_defined_after",
+    "inference/instantiate_to_bounds_generic2_has_bound_defined_before",
+    "inference/void_return_type_subtypes_dynamic",
+    "nnbd_mixed/hierarchy/in_dill_out_in/in_out_in",
+    "nnbd_mixed/hierarchy/in_out_dill_in/in_out_in",
+    "nnbd/getter_vs_setter_type_nnbd",
+    "nnbd/getter_vs_setter_type",
+    "nnbd/null_access",
+    "patterns/exhaustiveness/bool_switch",
+    "patterns/exhaustiveness/enum_switch",
+    "patterns/for_final_variable",
+    "patterns/pattern_types",
+    "records/type_record_as_supertype"
+  };
+
+  @override
+  Future<Result<ComponentResult>> run(
+      ComponentResult result, ChainContext context) {
+    if (compileMode != CompileMode.full) return Future.value(pass(result));
+    // TODO(jensj): Delete this once failures are fixed.
+    if (ignoreBecauseOfFailures.contains(result.description.shortName)) {
+      return Future.value(pass(result));
+    }
+
+    Component component = result.component;
+    for (Library lib in component.libraries) {
+      if (!result.userLibraries.contains(lib.importUri)) continue;
+      if (!lib.fileUri.isScheme("file")) continue;
+      List<Uri> uris = [];
+      List<String> filenames = [];
+      for (LibraryPart part in lib.parts) {
+        // This is a bit simplistic but will probably work for our use here.
+        uris.add(lib.fileUri.resolve(part.partUri));
+        filenames.add(uris.last.pathSegments.last);
+      }
+      uris.add(lib.fileUri);
+      filenames.add(uris.last.pathSegments.last);
+
+      Set<String> expectProblemOn = {};
+      Set<String> expectNoProblemOn = {};
+      for (Uri uri in uris) {
+        Set<int> expectErrorOnLines = {};
+        Set<int> expectNoErrorOnLines = {};
+        Map<int, List<CommentToken>> linesToComments =
+            extractCommentsFromLines(uri);
+        categorizeCommentLines(
+            linesToComments, expectErrorOnLines, expectNoErrorOnLines);
+        for (int line in expectErrorOnLines) {
+          expectProblemOn.add("${uri.pathSegments.last}:$line");
+        }
+        for (int line in expectNoErrorOnLines) {
+          expectNoProblemOn.add("${uri.pathSegments.last}:$line");
+        }
+      }
+
+      // Now check.
+      if (expectProblemOn.isNotEmpty || expectNoProblemOn.isNotEmpty) {
+        List<String> failures = [];
+        Set<String> notYetSeen = new Set<String>.of(expectProblemOn);
+        // Sanity check: No overlap between error and no-error expectations.
+        Set<String> overlap = expectProblemOn.intersection(expectNoProblemOn);
+        if (overlap.isNotEmpty) {
+          for (String fileAndLine in overlap) {
+            failures.add("Test error: "
+                "$fileAndLine is marked as both error and no error.");
+          }
+        }
+
+        List<String>? libraryProblems = lib.problemsAsJson;
+        RegExp extractLineRegExp = RegExp(
+            "(${filenames.map((e) => RegExp.escape(e)).join("|")}):(\\d+)");
+
+        if (libraryProblems != null) {
+          for (String jsonString in libraryProblems) {
+            DiagnosticMessageFromJson message =
+                new DiagnosticMessageFromJson.fromJson(jsonString);
+            // By taking all of these we accept it if it's just mentioned in a
+            // context message too. Is that the precision we want?
+            for (String plainTextProblem in message.plainTextFormatted) {
+              List<RegExpMatch> matches =
+                  extractLineRegExp.allMatches(plainTextProblem).toList();
+              if (matches.isEmpty && throwOnNoMatch) {
+                throw "Couldn't extract any offsets from "
+                    "'$plainTextProblem' with '$extractLineRegExp'";
+              }
+              for (RegExpMatch match in matches) {
+                String lineString = match.group(0)!;
+                notYetSeen.remove(lineString);
+                if (expectNoProblemOn.contains(lineString)) {
+                  failures.add("Found error at $lineString "
+                      "but didn't expect any:\n"
+                      "$plainTextProblem");
+                }
+              }
+            }
+          }
+        }
+
+        for (String line in notYetSeen) {
+          failures.add("Expected error on $line but didn't find any.");
+        }
+
+        if (failures.isNotEmpty) {
+          return new Future.value(new Result<ComponentResult>(
+              result,
+              context.expectationSet["ErrorCommentCheckFailure"],
+              "Found ${failures.length} failures:\n\n * "
+              "${failures.join("\n\n * ")}\n"));
+        }
+      }
+    }
+
+    return Future.value(pass(result));
+  }
+
+  void categorizeCommentLines(Map<int, List<CommentToken>> linesToComments,
+      Set<int> expectErrorOnLines, Set<int> expectNoErrorOnLines) {
+    for (MapEntry<int, List<CommentToken>> entry in linesToComments.entries) {
+      for (CommentToken comment in entry.value) {
+        String message = comment.lexeme.trim().toLowerCase();
+        while (message.startsWith("//") || message.startsWith("/*")) {
+          message = message.substring(2).trim();
+        }
+        // TODO(jensj): Possibly reduce these cases by updating tests.
+        // See discussion in
+        // https://dart-review.googlesource.com/c/sdk/+/346301.
+        if (message == "error" ||
+            message == "error." ||
+            message == "error */" ||
+            message == "error*/" ||
+            message.startsWith("error in strong mode") ||
+            message.startsWith("error:") ||
+            message.startsWith("error,") ||
+            message.startsWith("error.") ||
+            message.startsWith("error - ") ||
+            message.startsWith("error (") ||
+            message.startsWith("error on ") ||
+            message.startsWith("error in ") ||
+            message.startsWith("error since ") ||
+            message.startsWith("error because ") ||
+            message.startsWith("not ok.") ||
+            message.startsWith("note: illegal ") ||
+            message.startsWith("parse error:") ||
+            message.startsWith("parse error,") ||
+            message.startsWith("compile-time error") ||
+            message.endsWith(" compile-time error")) {
+          expectErrorOnLines.add(entry.key);
+        } else if (message == "ok" ||
+            message == "ok." ||
+            message == "ok," ||
+            message == "ok */" ||
+            message.startsWith("ok: ") ||
+            message.startsWith("ok, ") ||
+            message.startsWith("ok (") ||
+            message.startsWith("ok because ") ||
+            message.startsWith("ok to ") ||
+            message.startsWith("now ok") ||
+            message.startsWith("no error.") ||
+            message.startsWith("no error:") ||
+            message.startsWith("no error ") ||
+            message.startsWith("not a compile time error") ||
+            message.startsWith("not an error") ||
+            message == "shouldn't result in a compile-time error.") {
+          expectNoErrorOnLines.add(entry.key);
+        }
+      }
+    }
+  }
+
+  Map<int, List<CommentToken>> extractCommentsFromLines(Uri uri) {
+    if (!uri.isScheme("file")) return const {};
+    File f = new File.fromUri(uri);
+    if (!f.existsSync()) return const {};
+    Uint8List rawBytes = f.readAsBytesSync();
+
+    Uint8List bytes = new Uint8List(rawBytes.length + 1);
+    bytes.setRange(0, rawBytes.length, rawBytes);
+
+    Utf8BytesScanner scanner = new Utf8BytesScanner(
+      bytes,
+      configuration: const ScannerConfiguration(
+          enableExtensionMethods: true,
+          enableNonNullable: true,
+          enableTripleShift: true),
+      includeComments: true,
+      languageVersionChanged: (scanner, languageVersion) {
+        // Nothing - but don't overwrite the previous settings.
+      },
+    );
+    Token firstToken = scanner.tokenize();
+    List<int> lineStarts = scanner.lineStarts;
+
+    Token? token = firstToken;
+    Token? previousToken;
+    Source lineStartsHelper = new Source(lineStarts, const [], null, null);
+    Map<int, List<CommentToken>> linesToComments = {};
+    while (token != null && !token.isEof) {
+      CommentToken? precedingComments = token.precedingComments;
+      while (precedingComments != null) {
+        int commentLine = lineStartsHelper
+            .getLocation(Uri.base /* dummy */, precedingComments.offset)
+            .line;
+        int tokenLine = lineStartsHelper
+            .getLocation(Uri.base /* dummy */, token.offset)
+            .line;
+        int likelyAboutLine = tokenLine;
+        if (previousToken != null) {
+          int previousTokenLine = lineStartsHelper
+              .getLocation(Uri.base /* dummy */, previousToken.offset)
+              .line;
+          if (previousTokenLine == commentLine) likelyAboutLine = commentLine;
+        }
+        if (!precedingComments.lexeme.startsWith("// Copyright (c)") &&
+            !precedingComments.lexeme
+                .startsWith("// for details. All rights reserved.") &&
+            !precedingComments.lexeme.startsWith("// BSD-style license")) {
+          (linesToComments[likelyAboutLine] ??= []).add(precedingComments);
+        }
+
+        Token? next = precedingComments.next;
+        if (next is CommentToken) {
+          precedingComments = next;
+        } else {
+          precedingComments = null;
+        }
+      }
+      previousToken = token;
+      token = token.next;
+    }
+    return linesToComments;
+  }
+}
+
 class Print extends Step<ComponentResult, ComponentResult, ChainContext> {
   const Print();
 
diff --git a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart
index f397c0e62c2..d1c967688fc 100644
--- a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart
+++ b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart
@@ -4,8 +4,9 @@
 
 // Test that it is an error to mix in a non-mixin class post 3.0.
 
+// Error
 class A with Comparable<int> {
   int compareTo(int x) => 0;
-} /* Error */
+}
 
 class B with Error {} /* Error */
diff --git a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.expect b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.expect
index e1561e18326..c8ad7a2bf25 100644
--- a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.expect
+++ b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //
diff --git a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.transformed.expect b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.transformed.expect
index a4ba7e46a25..d6953c2fbe0 100644
--- a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.transformed.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //
diff --git a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.expect b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.expect
index e1561e18326..c8ad7a2bf25 100644
--- a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.expect
+++ b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //
diff --git a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.modular.expect b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.modular.expect
index e1561e18326..c8ad7a2bf25 100644
--- a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.modular.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //
diff --git a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.outline.expect b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.outline.expect
index a687edb412b..88b3c475297 100644
--- a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.outline.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //
diff --git a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.transformed.expect b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.transformed.expect
index a4ba7e46a25..d6953c2fbe0 100644
--- a/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.transformed.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //
diff --git a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart
index fe450341bea..a5c73330f6e 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart
+++ b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart
@@ -28,8 +28,8 @@ class E1 {
 
 class E2 {
   E2._();
-  factory E2.new() => E2._(); // Error.
-  E2();
+  factory E2.new() => E2._();
+  E2(); // Error.
 }
 
 class E3 {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.strong.expect
index b13364f7dff..97c8379ee4c 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.strong.expect
@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.
diff --git a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.strong.transformed.expect
index b13364f7dff..97c8379ee4c 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.strong.transformed.expect
@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.
diff --git a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.expect
index b13364f7dff..97c8379ee4c 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.expect
@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.
diff --git a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.modular.expect
index b13364f7dff..97c8379ee4c 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.modular.expect
@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.
diff --git a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.outline.expect b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.outline.expect
index 43c1bf387c4..b8008f9098b 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.outline.expect
@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.
diff --git a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.transformed.expect
index b13364f7dff..97c8379ee4c 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.transformed.expect
@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.
diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart
index 26bd0541377..f61d00c9441 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart
@@ -13,20 +13,19 @@ void m<X>(X x) {}
 // Generic function instantiation to a type parameter is supported implicitly.
 class B<X> {
   final void Function(X) f;
-  const B() : f = m;
+  const B() : f = m; // OK.
 }
 
-// But it is not supported explicitly.
+// And it is also supported explicitly.
 class C<X> {
   final f;
-  const C() : f = m<X>; // Error, but should be accepted.
+  const C() : f = m<X>; // OK.
 }
 
 void main() {
   const A<int>(<int>[1]); // OK.
   const b = B<String>(); // OK.
   print(b.f.runtimeType); // OK: 'String => void'.
-  const c = C<
-      String>(); // Compile-time error in `C`, but should be accepted when it works.
-  print(c.f.runtimeType); // (Never executed, so we don't know).
+  const c = C<String>(); // OK.
+  print(c.f.runtimeType); // OK: 'String => void'.
 }
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart
index c889570f09c..1a60f8dfa49 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart
@@ -95,7 +95,7 @@ testArgs() {
   var c3a = f3a(42);
   expect(42, c3a.field);
   () {
-    f3a(); // error
+    f3a(); // error 
     f3a(42, 87); // error
   };
 
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.expect
index a9218befd43..ec57ed0d24a 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.expect
@@ -142,7 +142,7 @@ static method testArgs() → dynamic {
   self::expect(42, c3a.{self::Class3::field}{core::int});
   () → Null {
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:98:8: Error: Too few positional arguments: 1 required, 0 given.
-    f3a(); // error
+    f3a(); // error 
        ^" in f3a{<inapplicable>}.();
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:99:8: Error: Too many positional arguments: 1 allowed, but 2 found.
 Try removing the extra positional arguments.
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.transformed.expect
index de9a1681139..17478b06577 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.transformed.expect
@@ -142,7 +142,7 @@ static method testArgs() → dynamic {
   self::expect(42, c3a.{self::Class3::field}{core::int});
   () → Null {
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:98:8: Error: Too few positional arguments: 1 required, 0 given.
-    f3a(); // error
+    f3a(); // error 
        ^" in f3a{<inapplicable>}.();
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:99:8: Error: Too many positional arguments: 1 allowed, but 2 found.
 Try removing the extra positional arguments.
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.expect
index a9218befd43..ec57ed0d24a 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.expect
@@ -142,7 +142,7 @@ static method testArgs() → dynamic {
   self::expect(42, c3a.{self::Class3::field}{core::int});
   () → Null {
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:98:8: Error: Too few positional arguments: 1 required, 0 given.
-    f3a(); // error
+    f3a(); // error 
        ^" in f3a{<inapplicable>}.();
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:99:8: Error: Too many positional arguments: 1 allowed, but 2 found.
 Try removing the extra positional arguments.
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.modular.expect
index a9218befd43..ec57ed0d24a 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.modular.expect
@@ -142,7 +142,7 @@ static method testArgs() → dynamic {
   self::expect(42, c3a.{self::Class3::field}{core::int});
   () → Null {
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:98:8: Error: Too few positional arguments: 1 required, 0 given.
-    f3a(); // error
+    f3a(); // error 
        ^" in f3a{<inapplicable>}.();
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:99:8: Error: Too many positional arguments: 1 allowed, but 2 found.
 Try removing the extra positional arguments.
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.transformed.expect
index de9a1681139..17478b06577 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.transformed.expect
@@ -142,7 +142,7 @@ static method testArgs() → dynamic {
   self::expect(42, c3a.{self::Class3::field}{core::int});
   () → Null {
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:98:8: Error: Too few positional arguments: 1 required, 0 given.
-    f3a(); // error
+    f3a(); // error 
        ^" in f3a{<inapplicable>}.();
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:99:8: Error: Too many positional arguments: 1 allowed, but 2 found.
 Try removing the extra positional arguments.
diff --git a/pkg/front_end/testcases/dart2js/native.dart b/pkg/front_end/testcases/dart2js/native.dart
index 79e6c39e628..60fb9c4f1a6 100644
--- a/pkg/front_end/testcases/dart2js/native.dart
+++ b/pkg/front_end/testcases/dart2js/native.dart
@@ -17,14 +17,14 @@ set topLevelSetter(_) {}
 
 topLevelFunction() {}
 
-// NON_NATIVE_EXTERNAL               //# 01: compile-time error
-external get externalTopLevelGetter; //# 01: continued
+// NON_NATIVE_EXTERNAL
+external get externalTopLevelGetter;
 
-// NON_NATIVE_EXTERNAL                  //# 02: compile-time error
-external set externalTopLevelSetter(_); //# 02: continued
+// NON_NATIVE_EXTERNAL
+external set externalTopLevelSetter(_);
 
-// NON_NATIVE_EXTERNAL               //# 03: compile-time error
-external externalTopLevelFunction(); //# 03: continued
+// NON_NATIVE_EXTERNAL
+external externalTopLevelFunction();
 
 get nativeTopLevelGetter native;
 
@@ -36,17 +36,17 @@ class Class {
   Class.generative();
   factory Class.fact() => null;
 
-  // NON_NATIVE_EXTERNAL               //# 08: compile-time error
-  external Class.externalGenerative(); //# 08: continued
+  // NON_NATIVE_EXTERNAL
+  external Class.externalGenerative();
 
-  // NON_NATIVE_EXTERNAL                 //# 09: compile-time error
-  external factory Class.externalFact(); //# 09: continued
+  // NON_NATIVE_EXTERNAL
+  external factory Class.externalFact();
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 10: compile-time error
-  Class.nativeGenerative() native; //# 10: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  Class.nativeGenerative() native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 11: compile-time error
-  factory Class.nativeFact() native; //# 11: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  factory Class.nativeFact() native;
 
   var instanceField;
   get instanceGetter => null;
@@ -58,36 +58,36 @@ class Class {
   static set staticSetter(_) {}
   static staticMethod() {}
 
-  // NON_NATIVE_EXTERNAL               //# 22: compile-time error
-  external get externalInstanceGetter; //# 22: continued
+  // NON_NATIVE_EXTERNAL
+  external get externalInstanceGetter;
 
-  // NON_NATIVE_EXTERNAL                  //# 23: compile-time error
-  external set externalInstanceSetter(_); //# 23: continued
+  // NON_NATIVE_EXTERNAL
+  external set externalInstanceSetter(_);
 
-  // NON_NATIVE_EXTERNAL             //# 24: compile-time error
-  external externalInstanceMethod(); //# 24: continued
+  // NON_NATIVE_EXTERNAL
+  external externalInstanceMethod();
 
-  // NON_NATIVE_EXTERNAL                    //# 25: compile-time error
-  external static get externalStaticGetter; //# 25: continued
+  // NON_NATIVE_EXTERNAL
+  external static get externalStaticGetter;
 
-  // NON_NATIVE_EXTERNAL                       //# 26: compile-time error
-  external static set externalStaticSetter(_); //# 26: continued
+  // NON_NATIVE_EXTERNAL
+  external static set externalStaticSetter(_);
 
-  // NON_NATIVE_EXTERNAL                  //# 27: compile-time error
-  external static externalStaticMethod(); //# 27: continued
+  // NON_NATIVE_EXTERNAL
+  external static externalStaticMethod();
 
   get nativeInstanceGetter native;
   set nativeInstanceSetter(_) native;
   nativeInstanceMethod() native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 28: compile-time error
-  static get nativeStaticGetter native; //# 28: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static get nativeStaticGetter native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 29: compile-time error
-  static set nativeStaticSetter(_) native; //# 29: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static set nativeStaticSetter(_) native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 30: compile-time error
-  static nativeStaticMethod() native; //# 30: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static nativeStaticMethod() native;
 }
 
 @Native('d')
@@ -96,10 +96,10 @@ class NativeClass {
 
   factory NativeClass.fact() => null;
 
-  // NON_NATIVE_EXTERNAL                     //# 31: compile-time error
-  external NativeClass.externalGenerative(); //# 31: continued
-  // NON_NATIVE_EXTERNAL                       //# 32: compile-time error
-  external factory NativeClass.externalFact(); //# 32: continued
+  // NON_NATIVE_EXTERNAL
+  external NativeClass.externalGenerative();
+  // NON_NATIVE_EXTERNAL
+  external factory NativeClass.externalFact();
 
   NativeClass.nativeGenerative() native;
   factory NativeClass.nativeFact() native;
@@ -116,23 +116,23 @@ class NativeClass {
 
   var instanceNamedField;
 
-  // NON_NATIVE_EXTERNAL               //# 36: compile-time error
-  external get externalInstanceGetter; //# 36: continued
+  // NON_NATIVE_EXTERNAL
+  external get externalInstanceGetter;
 
-  // NON_NATIVE_EXTERNAL                  //# 37: compile-time error
-  external set externalInstanceSetter(_); //# 37: continued
+  // NON_NATIVE_EXTERNAL
+  external set externalInstanceSetter(_);
 
-  // NON_NATIVE_EXTERNAL             //# 38: compile-time error
-  external externalInstanceMethod(); //# 38: continued
+  // NON_NATIVE_EXTERNAL
+  external externalInstanceMethod();
 
-  // NON_NATIVE_EXTERNAL                    //# 39: compile-time error
-  external static get externalStaticGetter; //# 39: continued
+  // NON_NATIVE_EXTERNAL
+  external static get externalStaticGetter;
 
-  // NON_NATIVE_EXTERNAL                       //# 40: compile-time error
-  external static set externalStaticSetter(_); //# 40: continued
+  // NON_NATIVE_EXTERNAL
+  external static set externalStaticSetter(_);
 
-  // NON_NATIVE_EXTERNAL                  //# 41: compile-time error
-  external static externalStaticMethod(); //# 41: continued
+  // NON_NATIVE_EXTERNAL
+  external static externalStaticMethod();
 
   get nativeInstanceGetter native;
   set nativeInstanceSetter(_) native;
@@ -150,19 +150,19 @@ main() {
   topLevelGetter;
   topLevelSetter = null;
   topLevelFunction();
-  externalTopLevelGetter; //# 01: continued
-  externalTopLevelSetter = null; //# 02: continued
-  externalTopLevelFunction(); //# 03: continued
+  externalTopLevelGetter;
+  externalTopLevelSetter = null;
+  externalTopLevelFunction();
   nativeTopLevelGetter;
   nativeTopLevelSetter = null;
   nativeTopLevelFunction();
 
   var c1 = new Class.generative();
   new Class.fact();
-  new Class.externalGenerative(); //# 08: continued
-  new Class.externalFact(); //# 09: continued
-  new Class.nativeGenerative(); //# 10: continued
-  new Class.nativeFact(); //# 11: continued
+  new Class.externalGenerative();
+  new Class.externalFact();
+  new Class.nativeGenerative();
+  new Class.nativeFact();
   c1.instanceField;
   c1.instanceGetter;
   c1.instanceSetter = null;
@@ -171,23 +171,23 @@ main() {
   Class.staticGetter;
   Class.staticSetter = null;
   Class.staticMethod();
-  c1.externalInstanceGetter; //# 22: continued
-  c1.externalInstanceSetter = null; //# 23: continued
-  c1.externalInstanceMethod(); //# 24: continued
-  Class.externalStaticGetter; //# 25: continued
-  Class.externalStaticSetter = null; //# 26: continued
-  Class.externalStaticMethod(); //# 27: continued
+  c1.externalInstanceGetter;
+  c1.externalInstanceSetter = null;
+  c1.externalInstanceMethod();
+  Class.externalStaticGetter;
+  Class.externalStaticSetter = null;
+  Class.externalStaticMethod();
   c1.nativeInstanceGetter;
   c1.nativeInstanceSetter = null;
   c1.nativeInstanceMethod();
-  Class.nativeStaticGetter; //# 28: continued
-  Class.nativeStaticSetter = null; //# 29: continued
-  Class.nativeStaticMethod(); //# 30: continued
+  Class.nativeStaticGetter;
+  Class.nativeStaticSetter = null;
+  Class.nativeStaticMethod();
 
   var c2 = new NativeClass.generative();
   new NativeClass.fact();
-  new NativeClass.externalGenerative(); //# 31: continued
-  new NativeClass.externalFact(); //# 32: continued
+  new NativeClass.externalGenerative();
+  new NativeClass.externalFact();
   new NativeClass.nativeGenerative();
   new NativeClass.nativeFact();
   c2.instanceField;
@@ -198,12 +198,12 @@ main() {
   NativeClass.staticGetter;
   NativeClass.staticSetter = null;
   NativeClass.staticMethod();
-  c2.externalInstanceGetter; //# 36: continued
-  c2.externalInstanceSetter = null; //# 37: continued
-  c2.externalInstanceMethod(); //# 38: continued
-  NativeClass.externalStaticGetter; //# 39: continued
-  NativeClass.externalStaticSetter = null; //# 40: continued
-  NativeClass.externalStaticMethod(); //# 41: continued
+  c2.externalInstanceGetter;
+  c2.externalInstanceSetter = null;
+  c2.externalInstanceMethod();
+  NativeClass.externalStaticGetter;
+  NativeClass.externalStaticSetter = null;
+  NativeClass.externalStaticMethod();
   c2.nativeInstanceGetter;
   c2.nativeInstanceSetter = null;
   c2.nativeInstanceMethod();
diff --git a/pkg/front_end/testcases/dart2js/native_legacy.dart b/pkg/front_end/testcases/dart2js/native_legacy.dart
index 23afd823d83..d6bcf4403b8 100644
--- a/pkg/front_end/testcases/dart2js/native_legacy.dart
+++ b/pkg/front_end/testcases/dart2js/native_legacy.dart
@@ -15,14 +15,14 @@ set topLevelSetter(_) {}
 
 topLevelFunction() {}
 
-// NON_NATIVE_EXTERNAL               //# 01: compile-time error
-external get externalTopLevelGetter; //# 01: continued
+// NON_NATIVE_EXTERNAL
+external get externalTopLevelGetter;
 
-// NON_NATIVE_EXTERNAL                  //# 02: compile-time error
-external set externalTopLevelSetter(_); //# 02: continued
+// NON_NATIVE_EXTERNAL
+external set externalTopLevelSetter(_);
 
-// NON_NATIVE_EXTERNAL               //# 03: compile-time error
-external externalTopLevelFunction(); //# 03: continued
+// NON_NATIVE_EXTERNAL
+external externalTopLevelFunction();
 
 get nativeTopLevelGetter native;
 
@@ -34,17 +34,17 @@ class Class {
   Class.generative();
   factory Class.fact() => null as dynamic;
 
-  // NON_NATIVE_EXTERNAL               //# 08: compile-time error
-  external Class.externalGenerative(); //# 08: continued
+  // NON_NATIVE_EXTERNAL
+  external Class.externalGenerative();
 
-  // NON_NATIVE_EXTERNAL                 //# 09: compile-time error
-  external factory Class.externalFact(); //# 09: continued
+  // NON_NATIVE_EXTERNAL
+  external factory Class.externalFact();
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 10: compile-time error
-  Class.nativeGenerative() native; //# 10: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  Class.nativeGenerative() native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 11: compile-time error
-  factory Class.nativeFact() native; //# 11: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  factory Class.nativeFact() native;
 
   var instanceField;
   get instanceGetter => null;
@@ -56,36 +56,36 @@ class Class {
   static set staticSetter(_) {}
   static staticMethod() {}
 
-  // NON_NATIVE_EXTERNAL               //# 22: compile-time error
-  external get externalInstanceGetter; //# 22: continued
+  // NON_NATIVE_EXTERNAL
+  external get externalInstanceGetter;
 
-  // NON_NATIVE_EXTERNAL                  //# 23: compile-time error
-  external set externalInstanceSetter(_); //# 23: continued
+  // NON_NATIVE_EXTERNAL
+  external set externalInstanceSetter(_);
 
-  // NON_NATIVE_EXTERNAL             //# 24: compile-time error
-  external externalInstanceMethod(); //# 24: continued
+  // NON_NATIVE_EXTERNAL
+  external externalInstanceMethod();
 
-  // NON_NATIVE_EXTERNAL                    //# 25: compile-time error
-  external static get externalStaticGetter; //# 25: continued
+  // NON_NATIVE_EXTERNAL
+  external static get externalStaticGetter;
 
-  // NON_NATIVE_EXTERNAL                       //# 26: compile-time error
-  external static set externalStaticSetter(_); //# 26: continued
+  // NON_NATIVE_EXTERNAL
+  external static set externalStaticSetter(_);
 
-  // NON_NATIVE_EXTERNAL                  //# 27: compile-time error
-  external static externalStaticMethod(); //# 27: continued
+  // NON_NATIVE_EXTERNAL
+  external static externalStaticMethod();
 
   get nativeInstanceGetter native;
   set nativeInstanceSetter(_) native;
   nativeInstanceMethod() native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 28: compile-time error
-  static get nativeStaticGetter native; //# 28: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static get nativeStaticGetter native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 29: compile-time error
-  static set nativeStaticSetter(_) native; //# 29: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static set nativeStaticSetter(_) native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 30: compile-time error
-  static nativeStaticMethod() native; //# 30: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static nativeStaticMethod() native;
 }
 
 @Native('d')
@@ -94,10 +94,10 @@ class NativeClass {
 
   factory NativeClass.fact() => null as dynamic;
 
-  // NON_NATIVE_EXTERNAL                     //# 31: compile-time error
-  external NativeClass.externalGenerative(); //# 31: continued
-  // NON_NATIVE_EXTERNAL                       //# 32: compile-time error
-  external factory NativeClass.externalFact(); //# 32: continued
+  // NON_NATIVE_EXTERNAL
+  external NativeClass.externalGenerative();
+  // NON_NATIVE_EXTERNAL
+  external factory NativeClass.externalFact();
 
   NativeClass.nativeGenerative() native;
   factory NativeClass.nativeFact() native;
@@ -114,23 +114,23 @@ class NativeClass {
 
   var instanceNamedField;
 
-  // NON_NATIVE_EXTERNAL               //# 36: compile-time error
-  external get externalInstanceGetter; //# 36: continued
+  // NON_NATIVE_EXTERNAL
+  external get externalInstanceGetter;
 
-  // NON_NATIVE_EXTERNAL                  //# 37: compile-time error
-  external set externalInstanceSetter(_); //# 37: continued
+  // NON_NATIVE_EXTERNAL
+  external set externalInstanceSetter(_);
 
-  // NON_NATIVE_EXTERNAL             //# 38: compile-time error
-  external externalInstanceMethod(); //# 38: continued
+  // NON_NATIVE_EXTERNAL
+  external externalInstanceMethod();
 
-  // NON_NATIVE_EXTERNAL                    //# 39: compile-time error
-  external static get externalStaticGetter; //# 39: continued
+  // NON_NATIVE_EXTERNAL
+  external static get externalStaticGetter;
 
-  // NON_NATIVE_EXTERNAL                       //# 40: compile-time error
-  external static set externalStaticSetter(_); //# 40: continued
+  // NON_NATIVE_EXTERNAL
+  external static set externalStaticSetter(_);
 
-  // NON_NATIVE_EXTERNAL                  //# 41: compile-time error
-  external static externalStaticMethod(); //# 41: continued
+  // NON_NATIVE_EXTERNAL
+  external static externalStaticMethod();
 
   get nativeInstanceGetter native;
   set nativeInstanceSetter(_) native;
@@ -148,19 +148,19 @@ main() {
   topLevelGetter;
   topLevelSetter = null;
   topLevelFunction();
-  externalTopLevelGetter; //# 01: continued
-  externalTopLevelSetter = null; //# 02: continued
-  externalTopLevelFunction(); //# 03: continued
+  externalTopLevelGetter;
+  externalTopLevelSetter = null;
+  externalTopLevelFunction();
   nativeTopLevelGetter;
   nativeTopLevelSetter = null;
   nativeTopLevelFunction();
 
   var c1 = new Class.generative();
   new Class.fact();
-  new Class.externalGenerative(); //# 08: continued
-  new Class.externalFact(); //# 09: continued
-  new Class.nativeGenerative(); //# 10: continued
-  new Class.nativeFact(); //# 11: continued
+  new Class.externalGenerative();
+  new Class.externalFact();
+  new Class.nativeGenerative();
+  new Class.nativeFact();
   c1.instanceField;
   c1.instanceGetter;
   c1.instanceSetter = null;
@@ -169,23 +169,23 @@ main() {
   Class.staticGetter;
   Class.staticSetter = null;
   Class.staticMethod();
-  c1.externalInstanceGetter; //# 22: continued
-  c1.externalInstanceSetter = null; //# 23: continued
-  c1.externalInstanceMethod(); //# 24: continued
-  Class.externalStaticGetter; //# 25: continued
-  Class.externalStaticSetter = null; //# 26: continued
-  Class.externalStaticMethod(); //# 27: continued
+  c1.externalInstanceGetter;
+  c1.externalInstanceSetter = null;
+  c1.externalInstanceMethod();
+  Class.externalStaticGetter;
+  Class.externalStaticSetter = null;
+  Class.externalStaticMethod();
   c1.nativeInstanceGetter;
   c1.nativeInstanceSetter = null;
   c1.nativeInstanceMethod();
-  Class.nativeStaticGetter; //# 28: continued
-  Class.nativeStaticSetter = null; //# 29: continued
-  Class.nativeStaticMethod(); //# 30: continued
+  Class.nativeStaticGetter;
+  Class.nativeStaticSetter = null;
+  Class.nativeStaticMethod();
 
   var c2 = new NativeClass.generative();
   new NativeClass.fact();
-  new NativeClass.externalGenerative(); //# 31: continued
-  new NativeClass.externalFact(); //# 32: continued
+  new NativeClass.externalGenerative();
+  new NativeClass.externalFact();
   new NativeClass.nativeGenerative();
   new NativeClass.nativeFact();
   c2.instanceField;
@@ -196,12 +196,12 @@ main() {
   NativeClass.staticGetter;
   NativeClass.staticSetter = null;
   NativeClass.staticMethod();
-  c2.externalInstanceGetter; //# 36: continued
-  c2.externalInstanceSetter = null; //# 37: continued
-  c2.externalInstanceMethod(); //# 38: continued
-  NativeClass.externalStaticGetter; //# 39: continued
-  NativeClass.externalStaticSetter = null; //# 40: continued
-  NativeClass.externalStaticMethod(); //# 41: continued
+  c2.externalInstanceGetter;
+  c2.externalInstanceSetter = null;
+  c2.externalInstanceMethod();
+  NativeClass.externalStaticGetter;
+  NativeClass.externalStaticSetter = null;
+  NativeClass.externalStaticMethod();
   c2.nativeInstanceGetter;
   c2.nativeInstanceSetter = null;
   c2.nativeInstanceMethod();
diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart b/pkg/front_end/testcases/enhanced_enums/declared_values.dart
index a560ba747a8..f3ecfd26885 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart
@@ -18,7 +18,7 @@ enum E3 {
   element;
 
   static const List<E3> values = [E3.element]; // Error in E3.
-  int values = 42; // Duplicate.
+  int values = 42; // Error: Duplicate.
 }
 
 enum E4 {
diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.expect
index 32856b1d930..a000e30b85c 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.expect
@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.
diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.transformed.expect
index 32856b1d930..a000e30b85c 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.transformed.expect
@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.
diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.expect
index ef63364d1ab..b99c5b9265e 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.expect
@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.
diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.modular.expect
index ef63364d1ab..b99c5b9265e 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.modular.expect
@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.
diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.outline.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.outline.expect
index a28b797aae1..18cc5e1ccc9 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.outline.expect
@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.
diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.transformed.expect
index ef63364d1ab..b99c5b9265e 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.transformed.expect
@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.
diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart
index 1a2078b614b..ca666affba5 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart
@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// Error.
 abstract mixin class A extends Enum {
-  // Error.
   int get foo => index;
 }
 
diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.expect
index 51d3cb9b20f..b70e5454ab4 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.expect
@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //
diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.transformed.expect
index 845bbe3ef9f..bc198b8fd25 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.transformed.expect
@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //
diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.expect
index 2c3f58ddb2a..a4060217466 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.expect
@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //
diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.modular.expect
index 2c3f58ddb2a..a4060217466 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.modular.expect
@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //
diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.outline.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.outline.expect
index 06b6ee65470..cb8e7024cae 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.outline.expect
@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //
diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.transformed.expect
index 82aa61510ac..cbea94c6d3f 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.transformed.expect
@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //
diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart
index a8e04a2c1ca..af2f1dd3550 100644
--- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart
+++ b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart
@@ -6,8 +6,9 @@ enum E1 {
   element.new(); // Ok: invocation of the unnamed constructor.
 }
 
+// Error.
 enum E2<values> {
-  element; // Error.
+  element;
 }
 
 enum E3<element> {
diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.expect
index afc1ff8c154..54187e24f11 100644
--- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -132,6 +132,6 @@ org-dartlang-testcase:///missed_checks.dart:
 - E1. (from org-dartlang-testcase:///missed_checks.dart:5:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- E2. (from org-dartlang-testcase:///missed_checks.dart:9:6)
-- E3. (from org-dartlang-testcase:///missed_checks.dart:13:6)
-- values. (from org-dartlang-testcase:///missed_checks.dart:17:6)
+- E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
+- E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
+- values. (from org-dartlang-testcase:///missed_checks.dart:18:6)
diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.transformed.expect
index afc1ff8c154..54187e24f11 100644
--- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.transformed.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -132,6 +132,6 @@ org-dartlang-testcase:///missed_checks.dart:
 - E1. (from org-dartlang-testcase:///missed_checks.dart:5:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- E2. (from org-dartlang-testcase:///missed_checks.dart:9:6)
-- E3. (from org-dartlang-testcase:///missed_checks.dart:13:6)
-- values. (from org-dartlang-testcase:///missed_checks.dart:17:6)
+- E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
+- E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
+- values. (from org-dartlang-testcase:///missed_checks.dart:18:6)
diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.expect
index b71ae8e271a..7967f2e1586 100644
--- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -132,6 +132,6 @@ org-dartlang-testcase:///missed_checks.dart:
 - E1. (from org-dartlang-testcase:///missed_checks.dart:5:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- E2. (from org-dartlang-testcase:///missed_checks.dart:9:6)
-- E3. (from org-dartlang-testcase:///missed_checks.dart:13:6)
-- values. (from org-dartlang-testcase:///missed_checks.dart:17:6)
+- E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
+- E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
+- values. (from org-dartlang-testcase:///missed_checks.dart:18:6)
diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.modular.expect
index b71ae8e271a..7967f2e1586 100644
--- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.modular.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -132,6 +132,6 @@ org-dartlang-testcase:///missed_checks.dart:
 - E1. (from org-dartlang-testcase:///missed_checks.dart:5:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- E2. (from org-dartlang-testcase:///missed_checks.dart:9:6)
-- E3. (from org-dartlang-testcase:///missed_checks.dart:13:6)
-- values. (from org-dartlang-testcase:///missed_checks.dart:17:6)
+- E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
+- E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
+- values. (from org-dartlang-testcase:///missed_checks.dart:18:6)
diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.outline.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.outline.expect
index 3bdf41d88d0..e749351a007 100644
--- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.outline.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -112,10 +112,10 @@ static method main() → dynamic
 Extra constant evaluation status:
 Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:5:6 -> ListConstant(const <E1*>[const E1{_Enum.index: 0, _Enum._name: "element"}])
 Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:6:3 -> InstanceConstant(const E1{_Enum.index: 0, _Enum._name: "element"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:9:6 -> ListConstant(const <E2<dynamic>*>[const E2<dynamic>{_Enum.index: 0, _Enum._name: "element"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:10:3 -> InstanceConstant(const E2<dynamic>{_Enum.index: 0, _Enum._name: "element"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:13:6 -> ListConstant(const <E3<dynamic>*>[const E3<dynamic>{_Enum.index: 0, _Enum._name: "element"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:14:3 -> InstanceConstant(const E3<dynamic>{_Enum.index: 0, _Enum._name: "element"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:17:6 -> ListConstant(const <values*>[const values{_Enum.index: 0, _Enum._name: "element"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:18:3 -> InstanceConstant(const values{_Enum.index: 0, _Enum._name: "element"})
+Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:10:6 -> ListConstant(const <E2<dynamic>*>[const E2<dynamic>{_Enum.index: 0, _Enum._name: "element"}])
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:11:3 -> InstanceConstant(const E2<dynamic>{_Enum.index: 0, _Enum._name: "element"})
+Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:14:6 -> ListConstant(const <E3<dynamic>*>[const E3<dynamic>{_Enum.index: 0, _Enum._name: "element"}])
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:15:3 -> InstanceConstant(const E3<dynamic>{_Enum.index: 0, _Enum._name: "element"})
+Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:18:6 -> ListConstant(const <values*>[const values{_Enum.index: 0, _Enum._name: "element"}])
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:19:3 -> InstanceConstant(const values{_Enum.index: 0, _Enum._name: "element"})
 Extra constant evaluation: evaluated: 28, effectively constant: 8
diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.transformed.expect
index b71ae8e271a..7967f2e1586 100644
--- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.transformed.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -132,6 +132,6 @@ org-dartlang-testcase:///missed_checks.dart:
 - E1. (from org-dartlang-testcase:///missed_checks.dart:5:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- E2. (from org-dartlang-testcase:///missed_checks.dart:9:6)
-- E3. (from org-dartlang-testcase:///missed_checks.dart:13:6)
-- values. (from org-dartlang-testcase:///missed_checks.dart:17:6)
+- E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
+- E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
+- values. (from org-dartlang-testcase:///missed_checks.dart:18:6)
diff --git a/pkg/front_end/testcases/extensions/check_bounds.dart b/pkg/front_end/testcases/extensions/check_bounds.dart
index 0712bf20062..aff6aa097b9 100644
--- a/pkg/front_end/testcases/extensions/check_bounds.dart
+++ b/pkg/front_end/testcases/extensions/check_bounds.dart
@@ -21,36 +21,36 @@ test(A a) {
   Class<A> classA = new Class<A>();
   Class<B> classB = new Class<B>();
 
-  classA.method(); // Expect method not found.
-  Extension(classA).method(); // Expect bounds mismatch.
-  Extension<A>(classA).method(); // Expect bounds mismatch.
+  classA.method(); // Error: Expect method not found.
+  Extension(classA).method(); // Error: Expect bounds mismatch.
+  Extension<A>(classA).method(); // Error: Expect bounds mismatch.
   Extension<B>(classB).method();
-  Extension(classA).genericMethod(a); // Expect bounds mismatch.
-  Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
-  Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
-  Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
-  Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
-  Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
+  Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
+  Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
   Extension<B>(classB).genericMethod<B>(a);
 
   classB.method();
   Extension(classB).method();
-  Extension<A>(classB).method(); // Expect bounds mismatch.
+  Extension<A>(classB).method(); // Error: Expect bounds mismatch.
   Extension<B>(classB).method();
 
-  classB.genericMethod(a); // Expect bounds mismatch.
-  classB.genericMethod<A>(a); // Expect bounds mismatch.
+  classB.genericMethod(a); // Error: Expect bounds mismatch.
+  classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
   classB.genericMethod<B>(a);
-  Extension(classB).genericMethod(a); // Expect bounds mismatch.
-  Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+  Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
   Extension(classB).genericMethod<B>(a);
-  Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
-  Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
-  Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
-  Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
+  Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
   Extension<B>(classB).genericMethod<B>(a);
 }
 
@@ -58,44 +58,44 @@ final A a = new A();
 final Class<A> classA = new Class<A>();
 final Class<B> classB = new Class<B>();
 
-final field1 = classA.method(); // Expect method not found.
-final field2 = Extension(classA).method(); // Expect bounds mismatch.
-final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+final field1 = classA.method(); // Error: Expect method not found.
+final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
+final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 final field4 = Extension<B>(classA).method();
-final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
-final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
-final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
+final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
+final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 final field9 =
-    Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field10 =
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 final field11 =
-    Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+    Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 final field12 =
-    Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+    Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field13 = Extension<B>(classB).genericMethod<B>(a);
 
 final field14 = classB.method();
 final field15 = Extension(classB).method();
-final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 final field17 = Extension<B>(classB).method();
 
-final field18 = classB.genericMethod(a); // Expect bounds mismatch.
-final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
+final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field20 = classB.genericMethod<B>(a);
-final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 final field22 =
-    Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+    Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field23 = Extension(classB).genericMethod<B>(a);
 final field24 =
-    Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 final field25 =
-    Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field26 =
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 final field27 =
-    Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+    Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 final field28 =
-    Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+    Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field29 = Extension<B>(classB).genericMethod<B>(a);
diff --git a/pkg/front_end/testcases/extensions/check_bounds.dart.strong.expect b/pkg/front_end/testcases/extensions/check_bounds.dart.strong.expect
index c2fb921bc45..18bbe8b6259 100644
--- a/pkg/front_end/testcases/extensions/check_bounds.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/check_bounds.dart.strong.expect
@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -322,14 +322,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-//   classA.method(); // Expect method not found.
+//   classA.method(); // Error: Expect method not found.
 //          ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:25:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).method(); // Expect bounds mismatch.
+//   Extension(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -339,7 +339,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).method(); // Expect bounds mismatch.
+//   Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -349,7 +349,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -359,7 +359,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -369,7 +369,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -379,7 +379,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -388,14 +388,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                      ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -405,7 +405,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -415,7 +415,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -425,7 +425,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -435,7 +435,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -444,14 +444,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -461,7 +461,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -471,7 +471,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -487,7 +487,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).method(); // Expect bounds mismatch.
+//   Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -497,7 +497,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   classB.genericMethod(a); // Expect bounds mismatch.
+//   classB.genericMethod(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -507,7 +507,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   classB.genericMethod<A>(a); // Expect bounds mismatch.
+//   classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -523,7 +523,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -533,7 +533,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -549,7 +549,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -559,7 +559,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -569,7 +569,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -579,7 +579,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -588,14 +588,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -605,7 +605,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -615,7 +615,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -968,7 +968,7 @@ static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-final field1 = classA.method(); // Expect method not found.
+final field1 = classA.method(); // Error: Expect method not found.
                       ^^^^^^" in self::classA{<unresolved>}.method();
 static final field dynamic field2 = self::Extension|method<self::A>(self::classA);
 static final field dynamic field3 = self::Extension|method<self::A>(self::classA);
@@ -983,14 +983,14 @@ static final field dynamic field6 = self::Extension|genericMethod<self::A, self:
 static final field dynamic field7 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                                   ^" in self::a as{TypeError} self::B);
 static final field dynamic field8 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field9 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field10 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field11 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field12 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1022,7 +1022,7 @@ static final field dynamic field25 = self::Extension|genericMethod<self::A, self
 static final field dynamic field26 = self::Extension|genericMethod<self::A, self::B>(self::classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field27 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field28 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1045,7 +1045,7 @@ static method test(self::A a) → dynamic {
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-  classA.method(); // Expect method not found.
+  classA.method(); // Error: Expect method not found.
          ^^^^^^" in classA{<unresolved>}.method();
   self::Extension|method<self::A>(classA);
   self::Extension|method<self::A>(classA);
@@ -1055,14 +1055,14 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                      ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
@@ -1094,7 +1094,7 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
diff --git a/pkg/front_end/testcases/extensions/check_bounds.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/check_bounds.dart.strong.transformed.expect
index c2fb921bc45..18bbe8b6259 100644
--- a/pkg/front_end/testcases/extensions/check_bounds.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/check_bounds.dart.strong.transformed.expect
@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -322,14 +322,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-//   classA.method(); // Expect method not found.
+//   classA.method(); // Error: Expect method not found.
 //          ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:25:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).method(); // Expect bounds mismatch.
+//   Extension(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -339,7 +339,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).method(); // Expect bounds mismatch.
+//   Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -349,7 +349,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -359,7 +359,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -369,7 +369,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -379,7 +379,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -388,14 +388,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                      ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -405,7 +405,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -415,7 +415,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -425,7 +425,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -435,7 +435,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -444,14 +444,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -461,7 +461,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -471,7 +471,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -487,7 +487,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).method(); // Expect bounds mismatch.
+//   Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -497,7 +497,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   classB.genericMethod(a); // Expect bounds mismatch.
+//   classB.genericMethod(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -507,7 +507,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   classB.genericMethod<A>(a); // Expect bounds mismatch.
+//   classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -523,7 +523,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -533,7 +533,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -549,7 +549,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -559,7 +559,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -569,7 +569,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -579,7 +579,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -588,14 +588,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -605,7 +605,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -615,7 +615,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -968,7 +968,7 @@ static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-final field1 = classA.method(); // Expect method not found.
+final field1 = classA.method(); // Error: Expect method not found.
                       ^^^^^^" in self::classA{<unresolved>}.method();
 static final field dynamic field2 = self::Extension|method<self::A>(self::classA);
 static final field dynamic field3 = self::Extension|method<self::A>(self::classA);
@@ -983,14 +983,14 @@ static final field dynamic field6 = self::Extension|genericMethod<self::A, self:
 static final field dynamic field7 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                                   ^" in self::a as{TypeError} self::B);
 static final field dynamic field8 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field9 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field10 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field11 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field12 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1022,7 +1022,7 @@ static final field dynamic field25 = self::Extension|genericMethod<self::A, self
 static final field dynamic field26 = self::Extension|genericMethod<self::A, self::B>(self::classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field27 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field28 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1045,7 +1045,7 @@ static method test(self::A a) → dynamic {
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-  classA.method(); // Expect method not found.
+  classA.method(); // Error: Expect method not found.
          ^^^^^^" in classA{<unresolved>}.method();
   self::Extension|method<self::A>(classA);
   self::Extension|method<self::A>(classA);
@@ -1055,14 +1055,14 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                      ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
@@ -1094,7 +1094,7 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
diff --git a/pkg/front_end/testcases/extensions/check_bounds.dart.weak.expect b/pkg/front_end/testcases/extensions/check_bounds.dart.weak.expect
index c2fb921bc45..18bbe8b6259 100644
--- a/pkg/front_end/testcases/extensions/check_bounds.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/check_bounds.dart.weak.expect
@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -322,14 +322,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-//   classA.method(); // Expect method not found.
+//   classA.method(); // Error: Expect method not found.
 //          ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:25:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).method(); // Expect bounds mismatch.
+//   Extension(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -339,7 +339,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).method(); // Expect bounds mismatch.
+//   Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -349,7 +349,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -359,7 +359,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -369,7 +369,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -379,7 +379,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -388,14 +388,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                      ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -405,7 +405,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -415,7 +415,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -425,7 +425,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -435,7 +435,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -444,14 +444,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -461,7 +461,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -471,7 +471,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -487,7 +487,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).method(); // Expect bounds mismatch.
+//   Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -497,7 +497,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   classB.genericMethod(a); // Expect bounds mismatch.
+//   classB.genericMethod(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -507,7 +507,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   classB.genericMethod<A>(a); // Expect bounds mismatch.
+//   classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -523,7 +523,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -533,7 +533,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -549,7 +549,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -559,7 +559,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -569,7 +569,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -579,7 +579,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -588,14 +588,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -605,7 +605,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -615,7 +615,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -968,7 +968,7 @@ static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-final field1 = classA.method(); // Expect method not found.
+final field1 = classA.method(); // Error: Expect method not found.
                       ^^^^^^" in self::classA{<unresolved>}.method();
 static final field dynamic field2 = self::Extension|method<self::A>(self::classA);
 static final field dynamic field3 = self::Extension|method<self::A>(self::classA);
@@ -983,14 +983,14 @@ static final field dynamic field6 = self::Extension|genericMethod<self::A, self:
 static final field dynamic field7 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                                   ^" in self::a as{TypeError} self::B);
 static final field dynamic field8 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field9 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field10 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field11 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field12 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1022,7 +1022,7 @@ static final field dynamic field25 = self::Extension|genericMethod<self::A, self
 static final field dynamic field26 = self::Extension|genericMethod<self::A, self::B>(self::classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field27 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field28 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1045,7 +1045,7 @@ static method test(self::A a) → dynamic {
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-  classA.method(); // Expect method not found.
+  classA.method(); // Error: Expect method not found.
          ^^^^^^" in classA{<unresolved>}.method();
   self::Extension|method<self::A>(classA);
   self::Extension|method<self::A>(classA);
@@ -1055,14 +1055,14 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                      ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
@@ -1094,7 +1094,7 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
diff --git a/pkg/front_end/testcases/extensions/check_bounds.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/check_bounds.dart.weak.modular.expect
index c2fb921bc45..18bbe8b6259 100644
--- a/pkg/front_end/testcases/extensions/check_bounds.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/check_bounds.dart.weak.modular.expect
@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -322,14 +322,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-//   classA.method(); // Expect method not found.
+//   classA.method(); // Error: Expect method not found.
 //          ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:25:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).method(); // Expect bounds mismatch.
+//   Extension(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -339,7 +339,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).method(); // Expect bounds mismatch.
+//   Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -349,7 +349,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -359,7 +359,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -369,7 +369,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -379,7 +379,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -388,14 +388,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                      ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -405,7 +405,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -415,7 +415,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -425,7 +425,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -435,7 +435,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -444,14 +444,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -461,7 +461,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -471,7 +471,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -487,7 +487,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).method(); // Expect bounds mismatch.
+//   Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -497,7 +497,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   classB.genericMethod(a); // Expect bounds mismatch.
+//   classB.genericMethod(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -507,7 +507,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   classB.genericMethod<A>(a); // Expect bounds mismatch.
+//   classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -523,7 +523,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -533,7 +533,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -549,7 +549,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -559,7 +559,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -569,7 +569,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -579,7 +579,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -588,14 +588,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -605,7 +605,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -615,7 +615,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -968,7 +968,7 @@ static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-final field1 = classA.method(); // Expect method not found.
+final field1 = classA.method(); // Error: Expect method not found.
                       ^^^^^^" in self::classA{<unresolved>}.method();
 static final field dynamic field2 = self::Extension|method<self::A>(self::classA);
 static final field dynamic field3 = self::Extension|method<self::A>(self::classA);
@@ -983,14 +983,14 @@ static final field dynamic field6 = self::Extension|genericMethod<self::A, self:
 static final field dynamic field7 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                                   ^" in self::a as{TypeError} self::B);
 static final field dynamic field8 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field9 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field10 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field11 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field12 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1022,7 +1022,7 @@ static final field dynamic field25 = self::Extension|genericMethod<self::A, self
 static final field dynamic field26 = self::Extension|genericMethod<self::A, self::B>(self::classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field27 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field28 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1045,7 +1045,7 @@ static method test(self::A a) → dynamic {
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-  classA.method(); // Expect method not found.
+  classA.method(); // Error: Expect method not found.
          ^^^^^^" in classA{<unresolved>}.method();
   self::Extension|method<self::A>(classA);
   self::Extension|method<self::A>(classA);
@@ -1055,14 +1055,14 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                      ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
@@ -1094,7 +1094,7 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
diff --git a/pkg/front_end/testcases/extensions/check_bounds.dart.weak.outline.expect b/pkg/front_end/testcases/extensions/check_bounds.dart.weak.outline.expect
index f3420f87a31..eeefbde27b0 100644
--- a/pkg/front_end/testcases/extensions/check_bounds.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/extensions/check_bounds.dart.weak.outline.expect
@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
diff --git a/pkg/front_end/testcases/extensions/check_bounds.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/check_bounds.dart.weak.transformed.expect
index c2fb921bc45..18bbe8b6259 100644
--- a/pkg/front_end/testcases/extensions/check_bounds.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/check_bounds.dart.weak.transformed.expect
@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -322,14 +322,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-//   classA.method(); // Expect method not found.
+//   classA.method(); // Error: Expect method not found.
 //          ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:25:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).method(); // Expect bounds mismatch.
+//   Extension(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -339,7 +339,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).method(); // Expect bounds mismatch.
+//   Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -349,7 +349,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -359,7 +359,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -369,7 +369,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -379,7 +379,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -388,14 +388,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                      ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -405,7 +405,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -415,7 +415,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -425,7 +425,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -435,7 +435,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -444,14 +444,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -461,7 +461,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -471,7 +471,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -487,7 +487,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).method(); // Expect bounds mismatch.
+//   Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -497,7 +497,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   classB.genericMethod(a); // Expect bounds mismatch.
+//   classB.genericMethod(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -507,7 +507,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   classB.genericMethod<A>(a); // Expect bounds mismatch.
+//   classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -523,7 +523,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -533,7 +533,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -549,7 +549,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -559,7 +559,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -569,7 +569,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -579,7 +579,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -588,14 +588,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -605,7 +605,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -615,7 +615,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -968,7 +968,7 @@ static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-final field1 = classA.method(); // Expect method not found.
+final field1 = classA.method(); // Error: Expect method not found.
                       ^^^^^^" in self::classA{<unresolved>}.method();
 static final field dynamic field2 = self::Extension|method<self::A>(self::classA);
 static final field dynamic field3 = self::Extension|method<self::A>(self::classA);
@@ -983,14 +983,14 @@ static final field dynamic field6 = self::Extension|genericMethod<self::A, self:
 static final field dynamic field7 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                                   ^" in self::a as{TypeError} self::B);
 static final field dynamic field8 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field9 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field10 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field11 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field12 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1022,7 +1022,7 @@ static final field dynamic field25 = self::Extension|genericMethod<self::A, self
 static final field dynamic field26 = self::Extension|genericMethod<self::A, self::B>(self::classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field27 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field28 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1045,7 +1045,7 @@ static method test(self::A a) → dynamic {
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-  classA.method(); // Expect method not found.
+  classA.method(); // Error: Expect method not found.
          ^^^^^^" in classA{<unresolved>}.method();
   self::Extension|method<self::A>(classA);
   self::Extension|method<self::A>(classA);
@@ -1055,14 +1055,14 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                      ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
@@ -1094,7 +1094,7 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
diff --git a/pkg/front_end/testcases/general/bounds_catch.dart b/pkg/front_end/testcases/general/bounds_catch.dart
index 84f78bd3fd6..2ee78575093 100644
--- a/pkg/front_end/testcases/general/bounds_catch.dart
+++ b/pkg/front_end/testcases/general/bounds_catch.dart
@@ -41,165 +41,138 @@ t5a() {
 }
 
 t6a() {
-  try {} on F<Class<ConcreteClass>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<Class<ConcreteClass>> catch (e) {}
 }
 
 t7a() {
-  try {} on F<Object> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on F<Object> catch (e) {}
 }
 
 t8a() {
-  try {} on F<int> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on F<int> catch (e) {}
 }
 
 s1a() {
-  try {} on G catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G catch (e) {}
 }
 
 s2a() {
-  try {} on G<dynamic> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<dynamic> catch (e) {}
 }
 
 s3a() {
-  try {} on G<Class> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class> catch (e) {}
 }
 
 s4a() {
-  try {} on G<Class<dynamic>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class<dynamic>> catch (e) {}
 }
 
 s5a() {
-  try {} on G<ConcreteClass> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<ConcreteClass> catch (e) {}
 }
 
 s6a() {
-  try {} on G<Class<ConcreteClass>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class<ConcreteClass>> catch (e) {}
 }
 
 s7a() {
-  try {} on G<Object> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on G<Object> catch (e) {}
 }
 
 s8a() {
-  try {} on G<int> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on G<int> catch (e) {}
 }
 
 t1b() {
-  try {} on F catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F catch (e) {}
 }
 
 t2b() {
-  try {} on F<dynamic> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<dynamic> catch (e) {}
 }
 
 t3b() {
-  try {} on F<Class> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<Class> catch (e) {}
 }
 
 t4b() {
-  try {} on F<Class<dynamic>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<Class<dynamic>> catch (e) {}
 }
 
 t5b() {
-  try {} on F<ConcreteClass> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<ConcreteClass> catch (e) {}
 }
 
 t6b() {
-  try {} on F<Class<ConcreteClass>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<Class<ConcreteClass>> catch (e) {}
 }
 
 t7b() {
-  try {} on F<Object> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on F<Object> catch (e) {}
 }
 
 t8b() {
-  try {} on F<int> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on F<int> catch (e) {}
 }
 
 s1b() {
-  try {} on G catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G catch (e) {}
 }
 
 s2b() {
-  try {} on G<dynamic> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<dynamic> catch (e) {}
 }
 
 s3b() {
-  try {} on G<Class> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class> catch (e) {}
 }
 
 s4b() {
-  try {} on G<Class<dynamic>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class<dynamic>> catch (e) {}
 }
 
 s5b() {
-  try {} on G<ConcreteClass> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<ConcreteClass> catch (e) {}
 }
 
 s6b() {
-  try {} on G<Class<ConcreteClass>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class<ConcreteClass>> catch (e) {}
 }
 
 s7b() {
-  try {} on G<Object> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on G<Object> catch (e) {}
 }
 
 s8b() {
-  try {} on G<int> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on G<int> catch (e) {}
 }
 
 main() {}
diff --git a/pkg/front_end/testcases/general/bounds_catch.dart.strong.expect b/pkg/front_end/testcases/general/bounds_catch.dart.strong.expect
index cb95b4ab648..19028d8fad8 100644
--- a/pkg/front_end/testcases/general/bounds_catch.dart.strong.expect
+++ b/pkg/front_end/testcases/general/bounds_catch.dart.strong.expect
@@ -6,73 +6,73 @@ library;
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:56:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:55:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:98:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:90:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:104:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:95:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:146:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:130:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:152:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:135:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:194:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:170:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:200:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:175:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
diff --git a/pkg/front_end/testcases/general/bounds_catch.dart.strong.transformed.expect b/pkg/front_end/testcases/general/bounds_catch.dart.strong.transformed.expect
index cb95b4ab648..19028d8fad8 100644
--- a/pkg/front_end/testcases/general/bounds_catch.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/bounds_catch.dart.strong.transformed.expect
@@ -6,73 +6,73 @@ library;
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:56:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:55:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:98:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:90:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:104:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:95:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:146:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:130:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:152:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:135:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:194:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:170:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:200:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:175:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
diff --git a/pkg/front_end/testcases/general/bounds_catch.dart.weak.expect b/pkg/front_end/testcases/general/bounds_catch.dart.weak.expect
index cb95b4ab648..19028d8fad8 100644
--- a/pkg/front_end/testcases/general/bounds_catch.dart.weak.expect
+++ b/pkg/front_end/testcases/general/bounds_catch.dart.weak.expect
@@ -6,73 +6,73 @@ library;
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:56:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:55:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:98:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:90:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:104:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:95:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:146:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:130:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:152:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:135:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:194:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:170:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:200:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:175:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
diff --git a/pkg/front_end/testcases/general/bounds_catch.dart.weak.modular.expect b/pkg/front_end/testcases/general/bounds_catch.dart.weak.modular.expect
index cb95b4ab648..19028d8fad8 100644
--- a/pkg/front_end/testcases/general/bounds_catch.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/bounds_catch.dart.weak.modular.expect
@@ -6,73 +6,73 @@ library;
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:56:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:55:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:98:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:90:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:104:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:95:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:146:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:130:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:152:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:135:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:194:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:170:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:200:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:175:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
diff --git a/pkg/front_end/testcases/general/bounds_catch.dart.weak.transformed.expect b/pkg/front_end/testcases/general/bounds_catch.dart.weak.transformed.expect
index cb95b4ab648..19028d8fad8 100644
--- a/pkg/front_end/testcases/general/bounds_catch.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/bounds_catch.dart.weak.transformed.expect
@@ -6,73 +6,73 @@ library;
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:56:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:55:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:98:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:90:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:104:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:95:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:146:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:130:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:152:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:135:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:194:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:170:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:200:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:175:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
diff --git a/pkg/front_end/testcases/general/covariant_equals.dart b/pkg/front_end/testcases/general/covariant_equals.dart
index 474dfbdc617..29c9f7a018b 100644
--- a/pkg/front_end/testcases/general/covariant_equals.dart
+++ b/pkg/front_end/testcases/general/covariant_equals.dart
@@ -45,7 +45,7 @@ test(A a, B b, C c_dynamic, C<int> c_int, C<String> c_string, D d) {
   c_int == c_dynamic; // ok
   c_int == c_int; // ok
   c_int == c_string; // error
-  c_int == d; // ok}
+  c_int == d; // ok
 
   c_string == a; // error
   c_string == b; // error
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart
index 18fd65a28b7..d0c073ed531 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart
@@ -1,13 +1,10 @@
 class Foo {
-  foo.x() {
-    // Not OK.
-  }
-  foo.x() : initializer = true {
-    // Not OK.
-  }
-  foo() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  foo.x() { }
+  // Not OK.
+  foo.x() : initializer = true { }
+  // Not OK.
+  foo() : initializer = true { }
   get Foo => 0;
   get Foo {
     return 0;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.strong.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.strong.expect
index 8b22244f7e0..2a90d655778 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.strong.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.strong.expect
@@ -2,343 +2,343 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:13: Error: 'initializer' isn't an instance field of this class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //             ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+//   foo() : initializer = true { }
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:14:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
 //   get Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:15: Error: 'bla' isn't an instance field of this class.
 //   get Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:18:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:11: Error: A setter should have exactly one formal parameter.
 //   set Foo => 0;
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:12: Error: Can't return a value from a void function.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:22:12: Error: Can't return a value from a void function.
 //     return 0;
 //            ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:11: Error: A setter should have exactly one formal parameter.
 //   set Foo {
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:26:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:13: Error: 'bla' isn't an instance field of this class.
 //   set Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:15: Error: 'bla' isn't an instance field of this class.
 //   set Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:30:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:34:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //               ^
 //
@@ -351,20 +351,20 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-  foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+  foo() : initializer = true { }
           ^^^^^^^^^^^" {}
   constructor X() → self::Foo
     : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo.X => 0;
                ^";
   constructor •() → self::Foo
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
   get Foo : bla = null => 0;
             ^^^"
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo : bla = null => 0;
                           ^";
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.strong.transformed.expect
index 8b22244f7e0..2a90d655778 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.strong.transformed.expect
@@ -2,343 +2,343 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:13: Error: 'initializer' isn't an instance field of this class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //             ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+//   foo() : initializer = true { }
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:14:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
 //   get Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:15: Error: 'bla' isn't an instance field of this class.
 //   get Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:18:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:11: Error: A setter should have exactly one formal parameter.
 //   set Foo => 0;
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:12: Error: Can't return a value from a void function.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:22:12: Error: Can't return a value from a void function.
 //     return 0;
 //            ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:11: Error: A setter should have exactly one formal parameter.
 //   set Foo {
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:26:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:13: Error: 'bla' isn't an instance field of this class.
 //   set Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:15: Error: 'bla' isn't an instance field of this class.
 //   set Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:30:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:34:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //               ^
 //
@@ -351,20 +351,20 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-  foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+  foo() : initializer = true { }
           ^^^^^^^^^^^" {}
   constructor X() → self::Foo
     : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo.X => 0;
                ^";
   constructor •() → self::Foo
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
   get Foo : bla = null => 0;
             ^^^"
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo : bla = null => 0;
                           ^";
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.expect
index 8b22244f7e0..2a90d655778 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.expect
@@ -2,343 +2,343 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:13: Error: 'initializer' isn't an instance field of this class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //             ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+//   foo() : initializer = true { }
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:14:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
 //   get Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:15: Error: 'bla' isn't an instance field of this class.
 //   get Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:18:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:11: Error: A setter should have exactly one formal parameter.
 //   set Foo => 0;
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:12: Error: Can't return a value from a void function.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:22:12: Error: Can't return a value from a void function.
 //     return 0;
 //            ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:11: Error: A setter should have exactly one formal parameter.
 //   set Foo {
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:26:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:13: Error: 'bla' isn't an instance field of this class.
 //   set Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:15: Error: 'bla' isn't an instance field of this class.
 //   set Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:30:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:34:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //               ^
 //
@@ -351,20 +351,20 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-  foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+  foo() : initializer = true { }
           ^^^^^^^^^^^" {}
   constructor X() → self::Foo
     : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo.X => 0;
                ^";
   constructor •() → self::Foo
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
   get Foo : bla = null => 0;
             ^^^"
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo : bla = null => 0;
                           ^";
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.modular.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.modular.expect
index 8b22244f7e0..2a90d655778 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.modular.expect
@@ -2,343 +2,343 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:13: Error: 'initializer' isn't an instance field of this class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //             ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+//   foo() : initializer = true { }
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:14:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
 //   get Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:15: Error: 'bla' isn't an instance field of this class.
 //   get Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:18:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:11: Error: A setter should have exactly one formal parameter.
 //   set Foo => 0;
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:12: Error: Can't return a value from a void function.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:22:12: Error: Can't return a value from a void function.
 //     return 0;
 //            ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:11: Error: A setter should have exactly one formal parameter.
 //   set Foo {
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:26:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:13: Error: 'bla' isn't an instance field of this class.
 //   set Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:15: Error: 'bla' isn't an instance field of this class.
 //   set Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:30:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:34:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //               ^
 //
@@ -351,20 +351,20 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-  foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+  foo() : initializer = true { }
           ^^^^^^^^^^^" {}
   constructor X() → self::Foo
     : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo.X => 0;
                ^";
   constructor •() → self::Foo
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
   get Foo : bla = null => 0;
             ^^^"
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo : bla = null => 0;
                           ^";
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.outline.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.outline.expect
index 1a4fcabab44..e42bd18032c 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.outline.expect
@@ -2,254 +2,254 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.transformed.expect
index 8b22244f7e0..2a90d655778 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.transformed.expect
@@ -2,343 +2,343 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:13: Error: 'initializer' isn't an instance field of this class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //             ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+//   foo() : initializer = true { }
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:14:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
 //   get Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:15: Error: 'bla' isn't an instance field of this class.
 //   get Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:18:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:11: Error: A setter should have exactly one formal parameter.
 //   set Foo => 0;
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:12: Error: Can't return a value from a void function.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:22:12: Error: Can't return a value from a void function.
 //     return 0;
 //            ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:11: Error: A setter should have exactly one formal parameter.
 //   set Foo {
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:26:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:13: Error: 'bla' isn't an instance field of this class.
 //   set Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:15: Error: 'bla' isn't an instance field of this class.
 //   set Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:30:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:34:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //               ^
 //
@@ -351,20 +351,20 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-  foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+  foo() : initializer = true { }
           ^^^^^^^^^^^" {}
   constructor X() → self::Foo
     : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo.X => 0;
                ^";
   constructor •() → self::Foo
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
   get Foo : bla = null => 0;
             ^^^"
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo : bla = null => 0;
                           ^";
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart
index 9025e569da3..8fe5ebdae4d 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart
@@ -1,11 +1,8 @@
 class Foo {
-  get foo.x() {
-    // Not OK.
-  }
-  get foo.x() : initializer = true {
-    // Not OK.
-  }
-  get foo() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  get foo.x() { }
+  // Not OK.
+  get foo.x() : initializer = true { }
+  // Not OK.
+  get foo() : initializer = true { }
 }
\ No newline at end of file
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.strong.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.strong.expect
index 97246845b76..975e03887c5 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.strong.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.strong.expect
@@ -2,51 +2,51 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   get foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -56,7 +56,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  get foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  get foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.strong.transformed.expect
index 97246845b76..975e03887c5 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.strong.transformed.expect
@@ -2,51 +2,51 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   get foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -56,7 +56,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  get foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  get foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.expect
index 97246845b76..975e03887c5 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.expect
@@ -2,51 +2,51 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   get foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -56,7 +56,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  get foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  get foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.modular.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.modular.expect
index 97246845b76..975e03887c5 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.modular.expect
@@ -2,51 +2,51 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   get foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -56,7 +56,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  get foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  get foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.outline.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.outline.expect
index 0ed6b84012e..7aeb38817b3 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.outline.expect
@@ -2,43 +2,43 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.transformed.expect
index 97246845b76..975e03887c5 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.transformed.expect
@@ -2,51 +2,51 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   get foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -56,7 +56,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  get foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  get foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart
index 2c827a6267a..b9151e92b5f 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart
@@ -1,11 +1,8 @@
 class Foo {
-  void foo.x() {
-    // Not OK.
-  }
-  void foo.x() : initializer = true {
-    // Not OK.
-  }
-  void foo() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  void foo.x() { }
+  // Not OK.
+  void foo.x() : initializer = true { }
+  // Not OK.
+  void foo() : initializer = true {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.strong.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.strong.expect
index f77881ee953..a493a2b3327 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.strong.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.strong.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:18: Error: 'initializer' isn't an instance field of this class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //                  ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+//   void foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-  void foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+  void foo() : initializer = true {}
                ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.strong.transformed.expect
index f77881ee953..a493a2b3327 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.strong.transformed.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:18: Error: 'initializer' isn't an instance field of this class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //                  ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+//   void foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-  void foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+  void foo() : initializer = true {}
                ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.expect
index f77881ee953..a493a2b3327 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:18: Error: 'initializer' isn't an instance field of this class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //                  ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+//   void foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-  void foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+  void foo() : initializer = true {}
                ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.modular.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.modular.expect
index f77881ee953..a493a2b3327 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.modular.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:18: Error: 'initializer' isn't an instance field of this class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //                  ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+//   void foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-  void foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+  void foo() : initializer = true {}
                ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.outline.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.outline.expect
index 3bdf0b7d45c..cff86f18b05 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.outline.expect
@@ -2,38 +2,38 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.transformed.expect
index f77881ee953..a493a2b3327 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.transformed.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:18: Error: 'initializer' isn't an instance field of this class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //                  ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+//   void foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-  void foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+  void foo() : initializer = true {}
                ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart
index 4ecd30e13af..2db8cbe9609 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart
@@ -1,11 +1,8 @@
 class Foo {
-  set foo.x() {
-    // Not OK.
-  }
-  set foo.x() : initializer = true {
-    // Not OK.
-  }
-  set foo() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  set foo.x() { }
+  // Not OK.
+  set foo.x() : initializer = true { }
+  // Not OK.
+  set foo() : initializer = true { }
 }
\ No newline at end of file
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.strong.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.strong.expect
index 2990d0cc10e..be5e982de80 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.strong.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.strong.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   set foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  set foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  set foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.strong.transformed.expect
index 2990d0cc10e..be5e982de80 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.strong.transformed.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   set foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  set foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  set foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.expect
index 2990d0cc10e..be5e982de80 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   set foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  set foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  set foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.modular.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.modular.expect
index 2990d0cc10e..be5e982de80 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.modular.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   set foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  set foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  set foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.outline.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.outline.expect
index 741bee9bf24..f24dd22a83e 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.outline.expect
@@ -2,38 +2,38 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.transformed.expect
index 2990d0cc10e..be5e982de80 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.transformed.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   set foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  set foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  set foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart
index 5921c101256..abab26cdf03 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart
@@ -1,14 +1,10 @@
 class Foo {
-  get Foo() {
-    // Not OK.
-  }
-  get Foo() : initializer = true {
-    // Not OK.
-  }
-  get Foo.x() {
-    // Not OK.
-  }
-  get Foo.x() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  get Foo() { }
+  // Not OK.
+  get Foo() : initializer = true { }
+  // Not OK.
+  get Foo.x() { }
+  // Not OK.
+  get Foo.x() : initializer = true { }
 }
\ No newline at end of file
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.strong.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.strong.expect
index 73284ae6ac3..82341bdd0b2 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.strong.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.strong.expect
@@ -2,49 +2,49 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   get Foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -53,7 +53,7 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  get Foo() : initializer = true {
+  get Foo() : initializer = true { }
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.strong.transformed.expect
index 73284ae6ac3..82341bdd0b2 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.strong.transformed.expect
@@ -2,49 +2,49 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   get Foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -53,7 +53,7 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  get Foo() : initializer = true {
+  get Foo() : initializer = true { }
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.expect
index 73284ae6ac3..82341bdd0b2 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.expect
@@ -2,49 +2,49 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   get Foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -53,7 +53,7 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  get Foo() : initializer = true {
+  get Foo() : initializer = true { }
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.modular.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.modular.expect
index 73284ae6ac3..82341bdd0b2 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.modular.expect
@@ -2,49 +2,49 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   get Foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -53,7 +53,7 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  get Foo() : initializer = true {
+  get Foo() : initializer = true { }
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.outline.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.outline.expect
index b03db253028..e533fc6815f 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.outline.expect
@@ -2,41 +2,41 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.transformed.expect
index 73284ae6ac3..82341bdd0b2 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.transformed.expect
@@ -2,49 +2,49 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   get Foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -53,7 +53,7 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  get Foo() : initializer = true {
+  get Foo() : initializer = true { }
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart
index 44d5847c377..1960c4ace77 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart
@@ -1,14 +1,10 @@
 class Foo {
-  Foo() / : super() {
-    // Not OK.
-  }
-  Foo()./ : super() {
-    // Not OK.
-  }
-  foo() / : super() {
-    // Not OK.
-  }
-  foo()./ : super() {
-    // Not OK.
-  }
+  // Not OK.
+  Foo() / : super() {}
+  // Not OK.
+  Foo()./ : super() {}
+  // Not OK.
+  foo() / : super() {}
+  // Not OK.
+  foo()./ : super() {}
 }
\ No newline at end of file
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.strong.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.strong.expect
index 024effae52e..a2708af89a2 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.strong.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.strong.expect
@@ -2,135 +2,135 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Expected '{' before this.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Expected '{' before this.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: The name of a constructor must match the name of the enclosing class.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator '/' should have exactly one parameter.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator '/' should have exactly one parameter.
+//   Foo() / : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected '{' before this.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:3: Error: 'Foo' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:3: Context: Previous declaration of 'Foo'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:3: Context: Previous declaration of 'Foo'.
+//   Foo() / : super() {}
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected a class member, but got '.'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator '/' should have exactly one parameter.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: 'Foo./' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Context: Previous declaration of 'Foo./'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Context: Previous declaration of 'Foo./'.
+//   Foo() / : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Expected '{' before this.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Expected '{' before this.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator '/' should have exactly one parameter.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator '/' should have exactly one parameter.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: 'Foo./' is already declared in this scope.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: 'Foo./' is already declared in this scope.
+//   foo() / : super() {}
 //         ^^^^^
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Context: Previous declaration of 'Foo./'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected '{' before this.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected '{' before this.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:3: Error: 'foo' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:3: Error: 'foo' is already declared in this scope.
+//   foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:3: Context: Previous declaration of 'foo'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:3: Context: Previous declaration of 'foo'.
+//   foo() / : super() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected a class member, but got '.'.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected a class member, but got '.'.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator '/' should have exactly one parameter.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator '/' should have exactly one parameter.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: 'Foo./' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: 'Foo./' is already declared in this scope.
+//   foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Context: Previous declaration of 'Foo./'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Context: Previous declaration of 'Foo./'.
+//   foo() / : super() {}
 //         ^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.strong.transformed.expect
index 024effae52e..a2708af89a2 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.strong.transformed.expect
@@ -2,135 +2,135 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Expected '{' before this.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Expected '{' before this.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: The name of a constructor must match the name of the enclosing class.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator '/' should have exactly one parameter.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator '/' should have exactly one parameter.
+//   Foo() / : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected '{' before this.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:3: Error: 'Foo' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:3: Context: Previous declaration of 'Foo'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:3: Context: Previous declaration of 'Foo'.
+//   Foo() / : super() {}
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected a class member, but got '.'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator '/' should have exactly one parameter.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: 'Foo./' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Context: Previous declaration of 'Foo./'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Context: Previous declaration of 'Foo./'.
+//   Foo() / : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Expected '{' before this.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Expected '{' before this.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator '/' should have exactly one parameter.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator '/' should have exactly one parameter.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: 'Foo./' is already declared in this scope.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: 'Foo./' is already declared in this scope.
+//   foo() / : super() {}
 //         ^^^^^
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Context: Previous declaration of 'Foo./'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected '{' before this.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected '{' before this.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:3: Error: 'foo' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:3: Error: 'foo' is already declared in this scope.
+//   foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:3: Context: Previous declaration of 'foo'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:3: Context: Previous declaration of 'foo'.
+//   foo() / : super() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected a class member, but got '.'.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected a class member, but got '.'.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator '/' should have exactly one parameter.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator '/' should have exactly one parameter.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: 'Foo./' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: 'Foo./' is already declared in this scope.
+//   foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Context: Previous declaration of 'Foo./'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Context: Previous declaration of 'Foo./'.
+//   foo() / : super() {}
 //         ^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.expect
index 024effae52e..a2708af89a2 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.expect
@@ -2,135 +2,135 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Expected '{' before this.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Expected '{' before this.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: The name of a constructor must match the name of the enclosing class.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator '/' should have exactly one parameter.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator '/' should have exactly one parameter.
+//   Foo() / : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected '{' before this.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:3: Error: 'Foo' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:3: Context: Previous declaration of 'Foo'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:3: Context: Previous declaration of 'Foo'.
+//   Foo() / : super() {}
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected a class member, but got '.'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator '/' should have exactly one parameter.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: 'Foo./' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Context: Previous declaration of 'Foo./'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Context: Previous declaration of 'Foo./'.
+//   Foo() / : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Expected '{' before this.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Expected '{' before this.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator '/' should have exactly one parameter.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator '/' should have exactly one parameter.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: 'Foo./' is already declared in this scope.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: 'Foo./' is already declared in this scope.
+//   foo() / : super() {}
 //         ^^^^^
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Context: Previous declaration of 'Foo./'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected '{' before this.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected '{' before this.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:3: Error: 'foo' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:3: Error: 'foo' is already declared in this scope.
+//   foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:3: Context: Previous declaration of 'foo'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:3: Context: Previous declaration of 'foo'.
+//   foo() / : super() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected a class member, but got '.'.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected a class member, but got '.'.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator '/' should have exactly one parameter.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator '/' should have exactly one parameter.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: 'Foo./' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: 'Foo./' is already declared in this scope.
+//   foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Context: Previous declaration of 'Foo./'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Context: Previous declaration of 'Foo./'.
+//   foo() / : super() {}
 //         ^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.modular.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.modular.expect
index 024effae52e..a2708af89a2 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.modular.expect
@@ -2,135 +2,135 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Expected '{' before this.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Expected '{' before this.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: The name of a constructor must match the name of the enclosing class.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator '/' should have exactly one parameter.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator '/' should have exactly one parameter.
+//   Foo() / : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected '{' before this.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:3: Error: 'Foo' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:3: Context: Previous declaration of 'Foo'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:3: Context: Previous declaration of 'Foo'.
+//   Foo() / : super() {}
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected a class member, but got '.'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator '/' should have exactly one parameter.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: 'Foo./' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Context: Previous declaration of 'Foo./'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Context: Previous declaration of 'Foo./'.
+//   Foo() / : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Expected '{' before this.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Expected '{' before this.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator '/' should have exactly one parameter.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator '/' should have exactly one parameter.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: 'Foo./' is already declared in this scope.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: 'Foo./' is already declared in this scope.
+//   foo() / : super() {}
 //         ^^^^^
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Context: Previous declaration of 'Foo./'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected '{' before this.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected '{' before this.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:3: Error: 'foo' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:3: Error: 'foo' is already declared in this scope.
+//   foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:3: Context: Previous declaration of 'foo'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:3: Context: Previous declaration of 'foo'.
+//   foo() / : super() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected a class member, but got '.'.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected a class member, but got '.'.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator '/' should have exactly one parameter.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator '/' should have exactly one parameter.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: 'Foo./' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: 'Foo./' is already declared in this scope.
+//   foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Context: Previous declaration of 'Foo./'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Context: Previous declaration of 'Foo./'.
+//   foo() / : super() {}
 //         ^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.outline.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.outline.expect
index 8f889644785..76a0f923b73 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.outline.expect
@@ -2,135 +2,135 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Expected '{' before this.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Expected '{' before this.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: The name of a constructor must match the name of the enclosing class.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator '/' should have exactly one parameter.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator '/' should have exactly one parameter.
+//   Foo() / : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected '{' before this.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:3: Error: 'Foo' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:3: Context: Previous declaration of 'Foo'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:3: Context: Previous declaration of 'Foo'.
+//   Foo() / : super() {}
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected a class member, but got '.'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator '/' should have exactly one parameter.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: 'Foo./' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Context: Previous declaration of 'Foo./'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Context: Previous declaration of 'Foo./'.
+//   Foo() / : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Expected '{' before this.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Expected '{' before this.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator '/' should have exactly one parameter.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator '/' should have exactly one parameter.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: 'Foo./' is already declared in this scope.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: 'Foo./' is already declared in this scope.
+//   foo() / : super() {}
 //         ^^^^^
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Context: Previous declaration of 'Foo./'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected '{' before this.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected '{' before this.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:3: Error: 'foo' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:3: Error: 'foo' is already declared in this scope.
+//   foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:3: Context: Previous declaration of 'foo'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:3: Context: Previous declaration of 'foo'.
+//   foo() / : super() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected a class member, but got '.'.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected a class member, but got '.'.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator '/' should have exactly one parameter.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator '/' should have exactly one parameter.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: 'Foo./' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: 'Foo./' is already declared in this scope.
+//   foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Context: Previous declaration of 'Foo./'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Context: Previous declaration of 'Foo./'.
+//   foo() / : super() {}
 //         ^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.transformed.expect
index 024effae52e..a2708af89a2 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.transformed.expect
@@ -2,135 +2,135 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Expected '{' before this.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Expected '{' before this.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: The name of a constructor must match the name of the enclosing class.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator '/' should have exactly one parameter.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator '/' should have exactly one parameter.
+//   Foo() / : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected '{' before this.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:3: Error: 'Foo' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:3: Context: Previous declaration of 'Foo'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:3: Context: Previous declaration of 'Foo'.
+//   Foo() / : super() {}
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected a class member, but got '.'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator '/' should have exactly one parameter.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: 'Foo./' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Context: Previous declaration of 'Foo./'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Context: Previous declaration of 'Foo./'.
+//   Foo() / : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Expected '{' before this.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Expected '{' before this.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator '/' should have exactly one parameter.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator '/' should have exactly one parameter.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: 'Foo./' is already declared in this scope.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: 'Foo./' is already declared in this scope.
+//   foo() / : super() {}
 //         ^^^^^
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Context: Previous declaration of 'Foo./'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected '{' before this.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected '{' before this.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:3: Error: 'foo' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:3: Error: 'foo' is already declared in this scope.
+//   foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:3: Context: Previous declaration of 'foo'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:3: Context: Previous declaration of 'foo'.
+//   foo() / : super() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected a class member, but got '.'.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected a class member, but got '.'.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator '/' should have exactly one parameter.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator '/' should have exactly one parameter.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: 'Foo./' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: 'Foo./' is already declared in this scope.
+//   foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Context: Previous declaration of 'Foo./'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Context: Previous declaration of 'Foo./'.
+//   foo() / : super() {}
 //         ^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart
index fd9a67c4957..1f0d629dc1d 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart
@@ -1,14 +1,10 @@
 class Foo {
-  void Foo() {
-    // Not OK.
-  }
-  void Foo() : initializer = true {
-    // Not OK.
-  }
-  void Foo.x() {
-    // Not OK.
-  }
-  void Foo.x() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  void Foo() {}
+  // Not OK.
+  void Foo() : initializer = true {}
+  // Not OK.
+  void Foo.x() {}
+  // Not OK.
+  void Foo.x() : initializer = true {}
 }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.strong.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.strong.expect
index 1a4805452ca..d1ada3bd5a3 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.strong.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.strong.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() {
+//   void Foo() {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:8: Error: 'Foo' is already declared in this scope.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //        ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:8: Context: Previous declaration of 'Foo'.
-//   void Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:8: Context: Previous declaration of 'Foo'.
+//   void Foo() {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() {
+//   void Foo.x() {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() : initializer = true {
+//   void Foo.x() : initializer = true {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:8: Error: 'Foo.x' is already declared in this scope.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:8: Error: 'Foo.x' is already declared in this scope.
+//   void Foo.x() : initializer = true {}
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:8: Context: Previous declaration of 'Foo.x'.
-//   void Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:8: Context: Previous declaration of 'Foo.x'.
+//   void Foo.x() {}
 //        ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:16: Error: 'initializer' isn't an instance field of this class.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:18: Error: 'initializer' isn't an instance field of this class.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:18: Error: 'initializer' isn't an instance field of this class.
+//   void Foo.x() : initializer = true {}
 //                  ^^^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.strong.transformed.expect
index 1a4805452ca..d1ada3bd5a3 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.strong.transformed.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() {
+//   void Foo() {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:8: Error: 'Foo' is already declared in this scope.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //        ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:8: Context: Previous declaration of 'Foo'.
-//   void Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:8: Context: Previous declaration of 'Foo'.
+//   void Foo() {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() {
+//   void Foo.x() {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() : initializer = true {
+//   void Foo.x() : initializer = true {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:8: Error: 'Foo.x' is already declared in this scope.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:8: Error: 'Foo.x' is already declared in this scope.
+//   void Foo.x() : initializer = true {}
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:8: Context: Previous declaration of 'Foo.x'.
-//   void Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:8: Context: Previous declaration of 'Foo.x'.
+//   void Foo.x() {}
 //        ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:16: Error: 'initializer' isn't an instance field of this class.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:18: Error: 'initializer' isn't an instance field of this class.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:18: Error: 'initializer' isn't an instance field of this class.
+//   void Foo.x() : initializer = true {}
 //                  ^^^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.expect
index 1a4805452ca..d1ada3bd5a3 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() {
+//   void Foo() {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:8: Error: 'Foo' is already declared in this scope.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //        ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:8: Context: Previous declaration of 'Foo'.
-//   void Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:8: Context: Previous declaration of 'Foo'.
+//   void Foo() {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() {
+//   void Foo.x() {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() : initializer = true {
+//   void Foo.x() : initializer = true {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:8: Error: 'Foo.x' is already declared in this scope.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:8: Error: 'Foo.x' is already declared in this scope.
+//   void Foo.x() : initializer = true {}
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:8: Context: Previous declaration of 'Foo.x'.
-//   void Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:8: Context: Previous declaration of 'Foo.x'.
+//   void Foo.x() {}
 //        ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:16: Error: 'initializer' isn't an instance field of this class.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:18: Error: 'initializer' isn't an instance field of this class.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:18: Error: 'initializer' isn't an instance field of this class.
+//   void Foo.x() : initializer = true {}
 //                  ^^^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.modular.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.modular.expect
index 1a4805452ca..d1ada3bd5a3 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.modular.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() {
+//   void Foo() {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:8: Error: 'Foo' is already declared in this scope.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //        ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:8: Context: Previous declaration of 'Foo'.
-//   void Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:8: Context: Previous declaration of 'Foo'.
+//   void Foo() {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() {
+//   void Foo.x() {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() : initializer = true {
+//   void Foo.x() : initializer = true {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:8: Error: 'Foo.x' is already declared in this scope.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:8: Error: 'Foo.x' is already declared in this scope.
+//   void Foo.x() : initializer = true {}
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:8: Context: Previous declaration of 'Foo.x'.
-//   void Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:8: Context: Previous declaration of 'Foo.x'.
+//   void Foo.x() {}
 //        ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:16: Error: 'initializer' isn't an instance field of this class.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:18: Error: 'initializer' isn't an instance field of this class.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:18: Error: 'initializer' isn't an instance field of this class.
+//   void Foo.x() : initializer = true {}
 //                  ^^^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.outline.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.outline.expect
index 8613aa7b2f6..4599e4763bd 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.outline.expect
@@ -2,38 +2,38 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() {
+//   void Foo() {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:8: Error: 'Foo' is already declared in this scope.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //        ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:8: Context: Previous declaration of 'Foo'.
-//   void Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:8: Context: Previous declaration of 'Foo'.
+//   void Foo() {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() {
+//   void Foo.x() {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() : initializer = true {
+//   void Foo.x() : initializer = true {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:8: Error: 'Foo.x' is already declared in this scope.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:8: Error: 'Foo.x' is already declared in this scope.
+//   void Foo.x() : initializer = true {}
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:8: Context: Previous declaration of 'Foo.x'.
-//   void Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:8: Context: Previous declaration of 'Foo.x'.
+//   void Foo.x() {}
 //        ^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.transformed.expect
index 1a4805452ca..d1ada3bd5a3 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart.weak.transformed.expect
@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() {
+//   void Foo() {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:8: Error: 'Foo' is already declared in this scope.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //        ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:2:8: Context: Previous declaration of 'Foo'.
-//   void Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:3:8: Context: Previous declaration of 'Foo'.
+//   void Foo() {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() {
+//   void Foo.x() {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void Foo.x() : initializer = true {
+//   void Foo.x() : initializer = true {}
 //   ^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:8: Error: 'Foo.x' is already declared in this scope.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:8: Error: 'Foo.x' is already declared in this scope.
+//   void Foo.x() : initializer = true {}
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:8:8: Context: Previous declaration of 'Foo.x'.
-//   void Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:7:8: Context: Previous declaration of 'Foo.x'.
+//   void Foo.x() {}
 //        ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:5:16: Error: 'initializer' isn't an instance field of this class.
-//   void Foo() : initializer = true {
+//   void Foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:11:18: Error: 'initializer' isn't an instance field of this class.
-//   void Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_return_type.dart:9:18: Error: 'initializer' isn't an instance field of this class.
+//   void Foo.x() : initializer = true {}
 //                  ^^^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart
index 6f5b73ebc16..036325ddc25 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart
@@ -1,14 +1,10 @@
 class Foo {
-  set Foo() {
-    // Not OK.
-  }
-  set Foo() : initializer = true {
-    // Not OK.
-  }
-  set Foo.x() {
-    // Not OK.
-  }
-  set Foo.x() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  set Foo() {}
+  // Not OK.
+  set Foo() : initializer = true {}
+  // Not OK.
+  set Foo.x() {}
+  // Not OK.
+  set Foo.x() : initializer = true {}
 }
\ No newline at end of file
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.strong.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.strong.expect
index 802252b4c3c..5c9a30c0663 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.strong.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.strong.expect
@@ -2,43 +2,43 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   set Foo() {
+//   set Foo() {}
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() {
+//   set Foo.x() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() : initializer = true {
+//   set Foo.x() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   set Foo.x() : initializer = true {}
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   set Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   set Foo.x() {}
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:10: Error: A setter should have exactly one formal parameter.
-//   set Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:10: Error: A setter should have exactly one formal parameter.
+//   set Foo() {}
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   set Foo.x() : initializer = true {}
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -47,13 +47,13 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  set Foo() : initializer = true {
+  set Foo() : initializer = true {}
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}
   set Foo(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:10: Error: A setter should have exactly one formal parameter.
-  set Foo() {
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:10: Error: A setter should have exactly one formal parameter.
+  set Foo() {}
          ^";
     {}
   }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.strong.transformed.expect
index 802252b4c3c..5c9a30c0663 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.strong.transformed.expect
@@ -2,43 +2,43 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   set Foo() {
+//   set Foo() {}
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() {
+//   set Foo.x() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() : initializer = true {
+//   set Foo.x() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   set Foo.x() : initializer = true {}
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   set Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   set Foo.x() {}
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:10: Error: A setter should have exactly one formal parameter.
-//   set Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:10: Error: A setter should have exactly one formal parameter.
+//   set Foo() {}
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   set Foo.x() : initializer = true {}
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -47,13 +47,13 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  set Foo() : initializer = true {
+  set Foo() : initializer = true {}
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}
   set Foo(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:10: Error: A setter should have exactly one formal parameter.
-  set Foo() {
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:10: Error: A setter should have exactly one formal parameter.
+  set Foo() {}
          ^";
     {}
   }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.expect
index 802252b4c3c..5c9a30c0663 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.expect
@@ -2,43 +2,43 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   set Foo() {
+//   set Foo() {}
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() {
+//   set Foo.x() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() : initializer = true {
+//   set Foo.x() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   set Foo.x() : initializer = true {}
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   set Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   set Foo.x() {}
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:10: Error: A setter should have exactly one formal parameter.
-//   set Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:10: Error: A setter should have exactly one formal parameter.
+//   set Foo() {}
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   set Foo.x() : initializer = true {}
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -47,13 +47,13 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  set Foo() : initializer = true {
+  set Foo() : initializer = true {}
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}
   set Foo(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:10: Error: A setter should have exactly one formal parameter.
-  set Foo() {
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:10: Error: A setter should have exactly one formal parameter.
+  set Foo() {}
          ^";
     {}
   }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.modular.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.modular.expect
index 802252b4c3c..5c9a30c0663 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.modular.expect
@@ -2,43 +2,43 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   set Foo() {
+//   set Foo() {}
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() {
+//   set Foo.x() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() : initializer = true {
+//   set Foo.x() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   set Foo.x() : initializer = true {}
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   set Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   set Foo.x() {}
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:10: Error: A setter should have exactly one formal parameter.
-//   set Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:10: Error: A setter should have exactly one formal parameter.
+//   set Foo() {}
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   set Foo.x() : initializer = true {}
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -47,13 +47,13 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  set Foo() : initializer = true {
+  set Foo() : initializer = true {}
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}
   set Foo(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:10: Error: A setter should have exactly one formal parameter.
-  set Foo() {
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:10: Error: A setter should have exactly one formal parameter.
+  set Foo() {}
          ^";
     {}
   }
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.outline.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.outline.expect
index c76a80e2c2b..8c743000e08 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.outline.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   set Foo() {
+//   set Foo() {}
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() {
+//   set Foo.x() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() : initializer = true {
+//   set Foo.x() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   set Foo.x() : initializer = true {}
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   set Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   set Foo.x() {}
 //       ^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.transformed.expect
index 802252b4c3c..5c9a30c0663 100644
--- a/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart.weak.transformed.expect
@@ -2,43 +2,43 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   set Foo() {
+//   set Foo() {}
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() {
+//   set Foo.x() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.x() : initializer = true {
+//   set Foo.x() : initializer = true {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   set Foo.x() : initializer = true {}
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   set Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   set Foo.x() {}
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:10: Error: A setter should have exactly one formal parameter.
-//   set Foo() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:10: Error: A setter should have exactly one formal parameter.
+//   set Foo() {}
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   set Foo() : initializer = true {
+//   set Foo() : initializer = true {}
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   set Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   set Foo.x() : initializer = true {}
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -47,13 +47,13 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  set Foo() : initializer = true {
+  set Foo() : initializer = true {}
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}
   set Foo(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:2:10: Error: A setter should have exactly one formal parameter.
-  set Foo() {
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_set.dart:3:10: Error: A setter should have exactly one formal parameter.
+  set Foo() {}
          ^";
     {}
   }
diff --git a/pkg/front_end/testcases/general/external_constructor.dart b/pkg/front_end/testcases/general/external_constructor.dart
index 8657f72c7a3..5746d91763d 100644
--- a/pkg/front_end/testcases/general/external_constructor.dart
+++ b/pkg/front_end/testcases/general/external_constructor.dart
@@ -15,7 +15,7 @@ class C {
   final A a2;
 
   external C(); // Ok
-  C.named(this.a1, this.as2); // Ok
+  C.named(this.a1, this.a2); // Ok
 }
 
 class D {
@@ -38,6 +38,6 @@ class F {
   final A a1;
   final A a2;
 
-  F(this.a1, this.as2); // Ok
+  F(this.a1, this.a2); // Ok
   external F.named(); // Ok
 }
diff --git a/pkg/front_end/testcases/general/external_constructor.dart.strong.expect b/pkg/front_end/testcases/general/external_constructor.dart.strong.expect
index f77eefb41aa..f0936537af4 100644
--- a/pkg/front_end/testcases/general/external_constructor.dart.strong.expect
+++ b/pkg/front_end/testcases/general/external_constructor.dart.strong.expect
@@ -2,22 +2,6 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/external_constructor.dart:18:25: Error: 'as2' isn't an instance field of this class.
-//   C.named(this.a1, this.as2); // Ok
-//                         ^^^
-//
-// pkg/front_end/testcases/general/external_constructor.dart:41:19: Error: 'as2' isn't an instance field of this class.
-//   F(this.a1, this.as2); // Ok
-//                   ^^^
-//
-// pkg/front_end/testcases/general/external_constructor.dart:18:3: Error: Final field 'a2' is not initialized by this constructor.
-// Try to initialize the field using an initializing formal or a field initializer.
-//   C.named(this.a1, this.as2); // Ok
-//   ^^^^^
-// pkg/front_end/testcases/general/external_constructor.dart:15:11: Context: 'a2' is defined here.
-//   final A a2;
-//           ^^
-//
 // pkg/front_end/testcases/general/external_constructor.dart:26:3: Error: Final field 'a2' is not initialized by this constructor.
 // Try to initialize the field using an initializing formal or a field initializer.
 //   D.named(this.a1); // Error
@@ -34,14 +18,6 @@ library;
 //   final A a1;
 //           ^^
 //
-// pkg/front_end/testcases/general/external_constructor.dart:41:3: Error: Final field 'a2' is not initialized by this constructor.
-// Try to initialize the field using an initializing formal or a field initializer.
-//   F(this.a1, this.as2); // Ok
-//   ^
-// pkg/front_end/testcases/general/external_constructor.dart:39:11: Context: 'a2' is defined here.
-//   final A a2;
-//           ^^
-//
 import self as self;
 import "dart:core" as core;
 
@@ -58,10 +34,8 @@ class C extends core::Object {
   final field self::A a1;
   final field self::A a2;
   external constructor •() → self::C;
-  constructor named(self::A a1, dynamic as2) → self::C
-    : self::C::a2 = null, self::C::a1 = a1, final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/external_constructor.dart:18:25: Error: 'as2' isn't an instance field of this class.
-  C.named(this.a1, this.as2); // Ok
-                        ^^^"
+  constructor named(self::A a1, self::A a2) → self::C
+    : self::C::a1 = a1, self::C::a2 = a2, super core::Object::•()
     ;
 }
 class D extends core::Object {
@@ -83,10 +57,8 @@ class E extends core::Object {
 class F extends core::Object {
   final field self::A a1;
   final field self::A a2;
-  constructor •(self::A a1, dynamic as2) → self::F
-    : self::F::a2 = null, self::F::a1 = a1, final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/external_constructor.dart:41:19: Error: 'as2' isn't an instance field of this class.
-  F(this.a1, this.as2); // Ok
-                  ^^^"
+  constructor •(self::A a1, self::A a2) → self::F
+    : self::F::a1 = a1, self::F::a2 = a2, super core::Object::•()
     ;
   external constructor named() → self::F;
 }
diff --git a/pkg/front_end/testcases/general/external_constructor.dart.strong.transformed.expect b/pkg/front_end/testcases/general/external_constructor.dart.strong.transformed.expect
index f77eefb41aa..f0936537af4 100644
--- a/pkg/front_end/testcases/general/external_constructor.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/external_constructor.dart.strong.transformed.expect
@@ -2,22 +2,6 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/external_constructor.dart:18:25: Error: 'as2' isn't an instance field of this class.
-//   C.named(this.a1, this.as2); // Ok
-//                         ^^^
-//
-// pkg/front_end/testcases/general/external_constructor.dart:41:19: Error: 'as2' isn't an instance field of this class.
-//   F(this.a1, this.as2); // Ok
-//                   ^^^
-//
-// pkg/front_end/testcases/general/external_constructor.dart:18:3: Error: Final field 'a2' is not initialized by this constructor.
-// Try to initialize the field using an initializing formal or a field initializer.
-//   C.named(this.a1, this.as2); // Ok
-//   ^^^^^
-// pkg/front_end/testcases/general/external_constructor.dart:15:11: Context: 'a2' is defined here.
-//   final A a2;
-//           ^^
-//
 // pkg/front_end/testcases/general/external_constructor.dart:26:3: Error: Final field 'a2' is not initialized by this constructor.
 // Try to initialize the field using an initializing formal or a field initializer.
 //   D.named(this.a1); // Error
@@ -34,14 +18,6 @@ library;
 //   final A a1;
 //           ^^
 //
-// pkg/front_end/testcases/general/external_constructor.dart:41:3: Error: Final field 'a2' is not initialized by this constructor.
-// Try to initialize the field using an initializing formal or a field initializer.
-//   F(this.a1, this.as2); // Ok
-//   ^
-// pkg/front_end/testcases/general/external_constructor.dart:39:11: Context: 'a2' is defined here.
-//   final A a2;
-//           ^^
-//
 import self as self;
 import "dart:core" as core;
 
@@ -58,10 +34,8 @@ class C extends core::Object {
   final field self::A a1;
   final field self::A a2;
   external constructor •() → self::C;
-  constructor named(self::A a1, dynamic as2) → self::C
-    : self::C::a2 = null, self::C::a1 = a1, final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/external_constructor.dart:18:25: Error: 'as2' isn't an instance field of this class.
-  C.named(this.a1, this.as2); // Ok
-                        ^^^"
+  constructor named(self::A a1, self::A a2) → self::C
+    : self::C::a1 = a1, self::C::a2 = a2, super core::Object::•()
     ;
 }
 class D extends core::Object {
@@ -83,10 +57,8 @@ class E extends core::Object {
 class F extends core::Object {
   final field self::A a1;
   final field self::A a2;
-  constructor •(self::A a1, dynamic as2) → self::F
-    : self::F::a2 = null, self::F::a1 = a1, final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/external_constructor.dart:41:19: Error: 'as2' isn't an instance field of this class.
-  F(this.a1, this.as2); // Ok
-                  ^^^"
+  constructor •(self::A a1, self::A a2) → self::F
+    : self::F::a1 = a1, self::F::a2 = a2, super core::Object::•()
     ;
   external constructor named() → self::F;
 }
diff --git a/pkg/front_end/testcases/general/external_constructor.dart.textual_outline.expect b/pkg/front_end/testcases/general/external_constructor.dart.textual_outline.expect
index 83e71ce9c24..e8f10fb124d 100644
--- a/pkg/front_end/testcases/general/external_constructor.dart.textual_outline.expect
+++ b/pkg/front_end/testcases/general/external_constructor.dart.textual_outline.expect
@@ -9,7 +9,7 @@ class C {
   final A a1;
   final A a2;
   external C();
-  C.named(this.a1, this.as2);
+  C.named(this.a1, this.a2);
 }
 
 class D {
@@ -29,6 +29,6 @@ class E {
 class F {
   final A a1;
   final A a2;
-  F(this.a1, this.as2);
+  F(this.a1, this.a2);
   external F.named();
 }
diff --git a/pkg/front_end/testcases/general/external_constructor.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general/external_constructor.dart.textual_outline_modelled.expect
index 7d257fccad7..7025b702b00 100644
--- a/pkg/front_end/testcases/general/external_constructor.dart.textual_outline_modelled.expect
+++ b/pkg/front_end/testcases/general/external_constructor.dart.textual_outline_modelled.expect
@@ -6,7 +6,7 @@ class B {
 }
 
 class C {
-  C.named(this.a1, this.as2);
+  C.named(this.a1, this.a2);
   external C();
   final A a1;
   final A a2;
@@ -27,7 +27,7 @@ class E {
 }
 
 class F {
-  F(this.a1, this.as2);
+  F(this.a1, this.a2);
   external F.named();
   final A a1;
   final A a2;
diff --git a/pkg/front_end/testcases/general/external_constructor.dart.weak.expect b/pkg/front_end/testcases/general/external_constructor.dart.weak.expect
index f77eefb41aa..f0936537af4 100644
--- a/pkg/front_end/testcases/general/external_constructor.dart.weak.expect
+++ b/pkg/front_end/testcases/general/external_constructor.dart.weak.expect
@@ -2,22 +2,6 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/external_constructor.dart:18:25: Error: 'as2' isn't an instance field of this class.
-//   C.named(this.a1, this.as2); // Ok
-//                         ^^^
-//
-// pkg/front_end/testcases/general/external_constructor.dart:41:19: Error: 'as2' isn't an instance field of this class.
-//   F(this.a1, this.as2); // Ok
-//                   ^^^
-//
-// pkg/front_end/testcases/general/external_constructor.dart:18:3: Error: Final field 'a2' is not initialized by this constructor.
-// Try to initialize the field using an initializing formal or a field initializer.
-//   C.named(this.a1, this.as2); // Ok
-//   ^^^^^
-// pkg/front_end/testcases/general/external_constructor.dart:15:11: Context: 'a2' is defined here.
-//   final A a2;
-//           ^^
-//
 // pkg/front_end/testcases/general/external_constructor.dart:26:3: Error: Final field 'a2' is not initialized by this constructor.
 // Try to initialize the field using an initializing formal or a field initializer.
 //   D.named(this.a1); // Error
@@ -34,14 +18,6 @@ library;
 //   final A a1;
 //           ^^
 //
-// pkg/front_end/testcases/general/external_constructor.dart:41:3: Error: Final field 'a2' is not initialized by this constructor.
-// Try to initialize the field using an initializing formal or a field initializer.
-//   F(this.a1, this.as2); // Ok
-//   ^
-// pkg/front_end/testcases/general/external_constructor.dart:39:11: Context: 'a2' is defined here.
-//   final A a2;
-//           ^^
-//
 import self as self;
 import "dart:core" as core;
 
@@ -58,10 +34,8 @@ class C extends core::Object {
   final field self::A a1;
   final field self::A a2;
   external constructor •() → self::C;
-  constructor named(self::A a1, dynamic as2) → self::C
-    : self::C::a2 = null, self::C::a1 = a1, final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/external_constructor.dart:18:25: Error: 'as2' isn't an instance field of this class.
-  C.named(this.a1, this.as2); // Ok
-                        ^^^"
+  constructor named(self::A a1, self::A a2) → self::C
+    : self::C::a1 = a1, self::C::a2 = a2, super core::Object::•()
     ;
 }
 class D extends core::Object {
@@ -83,10 +57,8 @@ class E extends core::Object {
 class F extends core::Object {
   final field self::A a1;
   final field self::A a2;
-  constructor •(self::A a1, dynamic as2) → self::F
-    : self::F::a2 = null, self::F::a1 = a1, final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/external_constructor.dart:41:19: Error: 'as2' isn't an instance field of this class.
-  F(this.a1, this.as2); // Ok
-                  ^^^"
+  constructor •(self::A a1, self::A a2) → self::F
+    : self::F::a1 = a1, self::F::a2 = a2, super core::Object::•()
     ;
   external constructor named() → self::F;
 }
diff --git a/pkg/front_end/testcases/general/external_constructor.dart.weak.modular.expect b/pkg/front_end/testcases/general/external_constructor.dart.weak.modular.expect
index f77eefb41aa..f0936537af4 100644
--- a/pkg/front_end/testcases/general/external_constructor.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/external_constructor.dart.weak.modular.expect
@@ -2,22 +2,6 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/external_constructor.dart:18:25: Error: 'as2' isn't an instance field of this class.
-//   C.named(this.a1, this.as2); // Ok
-//                         ^^^
-//
-// pkg/front_end/testcases/general/external_constructor.dart:41:19: Error: 'as2' isn't an instance field of this class.
-//   F(this.a1, this.as2); // Ok
-//                   ^^^
-//
-// pkg/front_end/testcases/general/external_constructor.dart:18:3: Error: Final field 'a2' is not initialized by this constructor.
-// Try to initialize the field using an initializing formal or a field initializer.
-//   C.named(this.a1, this.as2); // Ok
-//   ^^^^^
-// pkg/front_end/testcases/general/external_constructor.dart:15:11: Context: 'a2' is defined here.
-//   final A a2;
-//           ^^
-//
 // pkg/front_end/testcases/general/external_constructor.dart:26:3: Error: Final field 'a2' is not initialized by this constructor.
 // Try to initialize the field using an initializing formal or a field initializer.
 //   D.named(this.a1); // Error
@@ -34,14 +18,6 @@ library;
 //   final A a1;
 //           ^^
 //
-// pkg/front_end/testcases/general/external_constructor.dart:41:3: Error: Final field 'a2' is not initialized by this constructor.
-// Try to initialize the field using an initializing formal or a field initializer.
-//   F(this.a1, this.as2); // Ok
-//   ^
-// pkg/front_end/testcases/general/external_constructor.dart:39:11: Context: 'a2' is defined here.
-//   final A a2;
-//           ^^
-//
 import self as self;
 import "dart:core" as core;
 
@@ -58,10 +34,8 @@ class C extends core::Object {
   final field self::A a1;
   final field self::A a2;
   external constructor •() → self::C;
-  constructor named(self::A a1, dynamic as2) → self::C
-    : self::C::a2 = null, self::C::a1 = a1, final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/external_constructor.dart:18:25: Error: 'as2' isn't an instance field of this class.
-  C.named(this.a1, this.as2); // Ok
-                        ^^^"
+  constructor named(self::A a1, self::A a2) → self::C
+    : self::C::a1 = a1, self::C::a2 = a2, super core::Object::•()
     ;
 }
 class D extends core::Object {
@@ -83,10 +57,8 @@ class E extends core::Object {
 class F extends core::Object {
   final field self::A a1;
   final field self::A a2;
-  constructor •(self::A a1, dynamic as2) → self::F
-    : self::F::a2 = null, self::F::a1 = a1, final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/external_constructor.dart:41:19: Error: 'as2' isn't an instance field of this class.
-  F(this.a1, this.as2); // Ok
-                  ^^^"
+  constructor •(self::A a1, self::A a2) → self::F
+    : self::F::a1 = a1, self::F::a2 = a2, super core::Object::•()
     ;
   external constructor named() → self::F;
 }
diff --git a/pkg/front_end/testcases/general/external_constructor.dart.weak.outline.expect b/pkg/front_end/testcases/general/external_constructor.dart.weak.outline.expect
index 8e375e3f407..0a5b71bcc87 100644
--- a/pkg/front_end/testcases/general/external_constructor.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/external_constructor.dart.weak.outline.expect
@@ -14,7 +14,7 @@ class C extends core::Object {
   final field self::A a1;
   final field self::A a2;
   external constructor •() → self::C;
-  constructor named(self::A a1, dynamic as2) → self::C
+  constructor named(self::A a1, self::A a2) → self::C
     ;
 }
 class D extends core::Object {
@@ -34,7 +34,7 @@ class E extends core::Object {
 class F extends core::Object {
   final field self::A a1;
   final field self::A a2;
-  constructor •(self::A a1, dynamic as2) → self::F
+  constructor •(self::A a1, self::A a2) → self::F
     ;
   external constructor named() → self::F;
 }
diff --git a/pkg/front_end/testcases/general/external_constructor.dart.weak.transformed.expect b/pkg/front_end/testcases/general/external_constructor.dart.weak.transformed.expect
index f77eefb41aa..f0936537af4 100644
--- a/pkg/front_end/testcases/general/external_constructor.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/external_constructor.dart.weak.transformed.expect
@@ -2,22 +2,6 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/external_constructor.dart:18:25: Error: 'as2' isn't an instance field of this class.
-//   C.named(this.a1, this.as2); // Ok
-//                         ^^^
-//
-// pkg/front_end/testcases/general/external_constructor.dart:41:19: Error: 'as2' isn't an instance field of this class.
-//   F(this.a1, this.as2); // Ok
-//                   ^^^
-//
-// pkg/front_end/testcases/general/external_constructor.dart:18:3: Error: Final field 'a2' is not initialized by this constructor.
-// Try to initialize the field using an initializing formal or a field initializer.
-//   C.named(this.a1, this.as2); // Ok
-//   ^^^^^
-// pkg/front_end/testcases/general/external_constructor.dart:15:11: Context: 'a2' is defined here.
-//   final A a2;
-//           ^^
-//
 // pkg/front_end/testcases/general/external_constructor.dart:26:3: Error: Final field 'a2' is not initialized by this constructor.
 // Try to initialize the field using an initializing formal or a field initializer.
 //   D.named(this.a1); // Error
@@ -34,14 +18,6 @@ library;
 //   final A a1;
 //           ^^
 //
-// pkg/front_end/testcases/general/external_constructor.dart:41:3: Error: Final field 'a2' is not initialized by this constructor.
-// Try to initialize the field using an initializing formal or a field initializer.
-//   F(this.a1, this.as2); // Ok
-//   ^
-// pkg/front_end/testcases/general/external_constructor.dart:39:11: Context: 'a2' is defined here.
-//   final A a2;
-//           ^^
-//
 import self as self;
 import "dart:core" as core;
 
@@ -58,10 +34,8 @@ class C extends core::Object {
   final field self::A a1;
   final field self::A a2;
   external constructor •() → self::C;
-  constructor named(self::A a1, dynamic as2) → self::C
-    : self::C::a2 = null, self::C::a1 = a1, final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/external_constructor.dart:18:25: Error: 'as2' isn't an instance field of this class.
-  C.named(this.a1, this.as2); // Ok
-                        ^^^"
+  constructor named(self::A a1, self::A a2) → self::C
+    : self::C::a1 = a1, self::C::a2 = a2, super core::Object::•()
     ;
 }
 class D extends core::Object {
@@ -83,10 +57,8 @@ class E extends core::Object {
 class F extends core::Object {
   final field self::A a1;
   final field self::A a2;
-  constructor •(self::A a1, dynamic as2) → self::F
-    : self::F::a2 = null, self::F::a1 = a1, final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/external_constructor.dart:41:19: Error: 'as2' isn't an instance field of this class.
-  F(this.a1, this.as2); // Ok
-                  ^^^"
+  constructor •(self::A a1, self::A a2) → self::F
+    : self::F::a1 = a1, self::F::a2 = a2, super core::Object::•()
     ;
   external constructor named() → self::F;
 }
diff --git a/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.expect b/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.expect
index 0b8dfde3242..5a5e37966ac 100644
--- a/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.expect
+++ b/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.expect
@@ -9,7 +9,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:35:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
+// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:36:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
 //  - Class._privateInjectedInstanceMember1
 //  - Class._privateInjectedInstanceMember2
 // Try to either
@@ -18,7 +18,7 @@ library;
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
 //
-// class ClassImplements
+// class ClassImplements implements Class {
 //       ^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/general/inject_private_patch/patch_lib1.dart:10:8: Context: 'Class._privateInjectedInstanceMember1' is defined here.
 //   void _privateInjectedInstanceMember1(Class c) {
diff --git a/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.transformed.expect
index 689f23c043f..b9f1d192e5d 100644
--- a/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.transformed.expect
@@ -9,7 +9,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:35:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
+// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:36:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
 //  - Class._privateInjectedInstanceMember1
 //  - Class._privateInjectedInstanceMember2
 // Try to either
@@ -18,7 +18,7 @@ library;
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
 //
-// class ClassImplements
+// class ClassImplements implements Class {
 //       ^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/general/inject_private_patch/patch_lib1.dart:10:8: Context: 'Class._privateInjectedInstanceMember1' is defined here.
 //   void _privateInjectedInstanceMember1(Class c) {
diff --git a/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.expect b/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.expect
index 0b8dfde3242..5a5e37966ac 100644
--- a/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.expect
+++ b/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.expect
@@ -9,7 +9,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:35:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
+// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:36:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
 //  - Class._privateInjectedInstanceMember1
 //  - Class._privateInjectedInstanceMember2
 // Try to either
@@ -18,7 +18,7 @@ library;
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
 //
-// class ClassImplements
+// class ClassImplements implements Class {
 //       ^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/general/inject_private_patch/patch_lib1.dart:10:8: Context: 'Class._privateInjectedInstanceMember1' is defined here.
 //   void _privateInjectedInstanceMember1(Class c) {
diff --git a/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.modular.expect b/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.modular.expect
index 0b8dfde3242..5a5e37966ac 100644
--- a/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.modular.expect
@@ -9,7 +9,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:35:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
+// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:36:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
 //  - Class._privateInjectedInstanceMember1
 //  - Class._privateInjectedInstanceMember2
 // Try to either
@@ -18,7 +18,7 @@ library;
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
 //
-// class ClassImplements
+// class ClassImplements implements Class {
 //       ^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/general/inject_private_patch/patch_lib1.dart:10:8: Context: 'Class._privateInjectedInstanceMember1' is defined here.
 //   void _privateInjectedInstanceMember1(Class c) {
diff --git a/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.outline.expect b/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.outline.expect
index c687cc2a4b3..9e8a3ec6f29 100644
--- a/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.outline.expect
@@ -10,7 +10,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:35:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
+// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:36:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
 //  - Class._privateInjectedInstanceMember1
 //  - Class._privateInjectedInstanceMember2
 // Try to either
@@ -19,7 +19,7 @@ library;
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
 //
-// class ClassImplements
+// class ClassImplements implements Class {
 //       ^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/general/inject_private_patch/patch_lib1.dart:10:8: Context: 'Class._privateInjectedInstanceMember1' is defined here.
 //   void _privateInjectedInstanceMember1(Class c) {
diff --git a/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.transformed.expect b/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.transformed.expect
index 689f23c043f..b9f1d192e5d 100644
--- a/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/inject_private_patch/main.dart.weak.transformed.expect
@@ -9,7 +9,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:35:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
+// pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart:36:7: Error: The non-abstract class 'ClassImplements' is missing implementations for these members:
 //  - Class._privateInjectedInstanceMember1
 //  - Class._privateInjectedInstanceMember2
 // Try to either
@@ -18,7 +18,7 @@ library;
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
 //
-// class ClassImplements
+// class ClassImplements implements Class {
 //       ^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/general/inject_private_patch/patch_lib1.dart:10:8: Context: 'Class._privateInjectedInstanceMember1' is defined here.
 //   void _privateInjectedInstanceMember1(Class c) {
diff --git a/pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart b/pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart
index 8a0b4d90298..3673ed0d031 100644
--- a/pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart
+++ b/pkg/front_end/testcases/general/inject_private_patch/origin_lib.dart
@@ -32,7 +32,7 @@ class ClassExtends extends Class /* Ok */ {
   void _privateInstanceMember() {}
 }
 
-class ClassImplements
-    implements Class /* // Error, missing (injected) members. */ {
+// Error, missing (injected) members.
+class ClassImplements implements Class {
   void _privateInstanceMember() {}
 }
diff --git a/pkg/front_end/testcases/general/issue49254.dart b/pkg/front_end/testcases/general/issue49254.dart
index cae95e98752..90ac4f2a57f 100644
--- a/pkg/front_end/testcases/general/issue49254.dart
+++ b/pkg/front_end/testcases/general/issue49254.dart
@@ -7,12 +7,12 @@ class C3 extends B3 {
 }
 
 class B3 extends A3 {
-  var bar = A3.initializeFoo;
+  var bar = A3.initializeFoo; // Error.
   B3(this.bar) : super();
 }
 
 class A3 {
-  var foo = C3.new; // Error.
+  var foo = C3.new;
   A3();
   A3.initializeFoo(this.foo);
 }
diff --git a/pkg/front_end/testcases/general/issue49254.dart.strong.expect b/pkg/front_end/testcases/general/issue49254.dart.strong.expect
index 71888c1b8b9..9a8a96503ec 100644
--- a/pkg/front_end/testcases/general/issue49254.dart.strong.expect
+++ b/pkg/front_end/testcases/general/issue49254.dart.strong.expect
@@ -4,7 +4,7 @@ library;
 //
 // pkg/front_end/testcases/general/issue49254.dart:10:7: Error: Can't infer the type of 'bar': circularity found during type inference.
 // Specify the type explicitly.
-//   var bar = A3.initializeFoo;
+//   var bar = A3.initializeFoo; // Error.
 //       ^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/issue49254.dart.strong.transformed.expect b/pkg/front_end/testcases/general/issue49254.dart.strong.transformed.expect
index 71888c1b8b9..9a8a96503ec 100644
--- a/pkg/front_end/testcases/general/issue49254.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/issue49254.dart.strong.transformed.expect
@@ -4,7 +4,7 @@ library;
 //
 // pkg/front_end/testcases/general/issue49254.dart:10:7: Error: Can't infer the type of 'bar': circularity found during type inference.
 // Specify the type explicitly.
-//   var bar = A3.initializeFoo;
+//   var bar = A3.initializeFoo; // Error.
 //       ^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/issue49254.dart.weak.expect b/pkg/front_end/testcases/general/issue49254.dart.weak.expect
index 71888c1b8b9..9a8a96503ec 100644
--- a/pkg/front_end/testcases/general/issue49254.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue49254.dart.weak.expect
@@ -4,7 +4,7 @@ library;
 //
 // pkg/front_end/testcases/general/issue49254.dart:10:7: Error: Can't infer the type of 'bar': circularity found during type inference.
 // Specify the type explicitly.
-//   var bar = A3.initializeFoo;
+//   var bar = A3.initializeFoo; // Error.
 //       ^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/issue49254.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue49254.dart.weak.modular.expect
index 71888c1b8b9..9a8a96503ec 100644
--- a/pkg/front_end/testcases/general/issue49254.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue49254.dart.weak.modular.expect
@@ -4,7 +4,7 @@ library;
 //
 // pkg/front_end/testcases/general/issue49254.dart:10:7: Error: Can't infer the type of 'bar': circularity found during type inference.
 // Specify the type explicitly.
-//   var bar = A3.initializeFoo;
+//   var bar = A3.initializeFoo; // Error.
 //       ^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/issue49254.dart.weak.outline.expect b/pkg/front_end/testcases/general/issue49254.dart.weak.outline.expect
index d1d581fd305..b41ae3e5dbd 100644
--- a/pkg/front_end/testcases/general/issue49254.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/issue49254.dart.weak.outline.expect
@@ -4,7 +4,7 @@ library;
 //
 // pkg/front_end/testcases/general/issue49254.dart:10:7: Error: Can't infer the type of 'bar': circularity found during type inference.
 // Specify the type explicitly.
-//   var bar = A3.initializeFoo;
+//   var bar = A3.initializeFoo; // Error.
 //       ^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/general/issue49254.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue49254.dart.weak.transformed.expect
index 71888c1b8b9..9a8a96503ec 100644
--- a/pkg/front_end/testcases/general/issue49254.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue49254.dart.weak.transformed.expect
@@ -4,7 +4,7 @@ library;
 //
 // pkg/front_end/testcases/general/issue49254.dart:10:7: Error: Can't infer the type of 'bar': circularity found during type inference.
 // Specify the type explicitly.
-//   var bar = A3.initializeFoo;
+//   var bar = A3.initializeFoo; // Error.
 //       ^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart
index 8de5086e367..0a58e86aee8 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart
@@ -14,8 +14,8 @@ test() {
   };
   String? y = f(42);
 
-  f = /*error:INVALID_CAST_FUNCTION_EXPR*/ /*@ returnType=Null */ (/*@type=Object*/ x) =>
-      'hello';
+  // error:INVALID_CAST_FUNCTION_EXPR
+  f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
 
   foo(/*@returnType=Null*/ (/*@type=Object*/ x) {
     return null;
diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.strong.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.strong.expect
index 470e145c305..819b2e8e783 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.strong.expect
@@ -2,9 +2,9 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:7: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
-//       'hello';
-//       ^
+// pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:54: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
+//   f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
+//                                                      ^
 //
 import self as self;
 import "dart:core" as core;
@@ -16,9 +16,9 @@ static method test() → dynamic {
     return null;
   };
   core::String? y = f(42){(core::Object) → Null};
-  f = (core::Object x) → Null => invalid-expression "pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:7: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
-      'hello';
-      ^" in "hello" as{TypeError} Null;
+  f = (core::Object x) → Null => invalid-expression "pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:54: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
+  f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
+                                                     ^" in "hello" as{TypeError} Null;
   self::foo((core::Object x) → Null {
     return null;
   });
diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.strong.transformed.expect
index 470e145c305..819b2e8e783 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.strong.transformed.expect
@@ -2,9 +2,9 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:7: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
-//       'hello';
-//       ^
+// pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:54: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
+//   f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
+//                                                      ^
 //
 import self as self;
 import "dart:core" as core;
@@ -16,9 +16,9 @@ static method test() → dynamic {
     return null;
   };
   core::String? y = f(42){(core::Object) → Null};
-  f = (core::Object x) → Null => invalid-expression "pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:7: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
-      'hello';
-      ^" in "hello" as{TypeError} Null;
+  f = (core::Object x) → Null => invalid-expression "pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:54: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
+  f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
+                                                     ^" in "hello" as{TypeError} Null;
   self::foo((core::Object x) → Null {
     return null;
   });
diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.expect
index 470e145c305..819b2e8e783 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.expect
@@ -2,9 +2,9 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:7: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
-//       'hello';
-//       ^
+// pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:54: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
+//   f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
+//                                                      ^
 //
 import self as self;
 import "dart:core" as core;
@@ -16,9 +16,9 @@ static method test() → dynamic {
     return null;
   };
   core::String? y = f(42){(core::Object) → Null};
-  f = (core::Object x) → Null => invalid-expression "pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:7: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
-      'hello';
-      ^" in "hello" as{TypeError} Null;
+  f = (core::Object x) → Null => invalid-expression "pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:54: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
+  f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
+                                                     ^" in "hello" as{TypeError} Null;
   self::foo((core::Object x) → Null {
     return null;
   });
diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.modular.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.modular.expect
index 470e145c305..819b2e8e783 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.modular.expect
@@ -2,9 +2,9 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:7: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
-//       'hello';
-//       ^
+// pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:54: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
+//   f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
+//                                                      ^
 //
 import self as self;
 import "dart:core" as core;
@@ -16,9 +16,9 @@ static method test() → dynamic {
     return null;
   };
   core::String? y = f(42){(core::Object) → Null};
-  f = (core::Object x) → Null => invalid-expression "pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:7: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
-      'hello';
-      ^" in "hello" as{TypeError} Null;
+  f = (core::Object x) → Null => invalid-expression "pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:54: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
+  f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
+                                                     ^" in "hello" as{TypeError} Null;
   self::foo((core::Object x) → Null {
     return null;
   });
diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.transformed.expect
index 470e145c305..819b2e8e783 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart.weak.transformed.expect
@@ -2,9 +2,9 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:7: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
-//       'hello';
-//       ^
+// pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:54: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
+//   f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
+//                                                      ^
 //
 import self as self;
 import "dart:core" as core;
@@ -16,9 +16,9 @@ static method test() → dynamic {
     return null;
   };
   core::String? y = f(42){(core::Object) → Null};
-  f = (core::Object x) → Null => invalid-expression "pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:7: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
-      'hello';
-      ^" in "hello" as{TypeError} Null;
+  f = (core::Object x) → Null => invalid-expression "pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_sync2.dart:18:54: Error: A value of type 'String' can't be returned from a function with return type 'Null'.
+  f = /*@ returnType=Null */ (/*@type=Object*/ x) => 'hello';
+                                                     ^" in "hello" as{TypeError} Null;
   self::foo((core::Object x) → Null {
     return null;
   });
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart
index b54bfa48b94..c346f56cbdf 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart
@@ -57,9 +57,9 @@ void test() {
     Function2<int, int> l0 = /*@returnType=int*/ (/*@type=int*/ x) => x;
     Function2<int, int> l1 = /*@returnType=int*/ (/*@type=int*/ x) =>
         x /*@target=num.+*/ + 1;
-    Function2<int, String>
-        l2 = /*error:INVALID_ASSIGNMENT*/ /*@returnType=String*/ (/*@type=int*/ x) =>
-            x;
+
+    // error:INVALID_ASSIGNMENT
+    Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
     Function2<int, String>
         l3 = /*@returnType=String*/ (/*@type=int*/ x) => /*info:DYNAMIC_CAST, info:DYNAMIC_INVOKE*/ x
             .substring(3);
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.expect b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.expect
index d59ff065604..7cdb4561874 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.expect
@@ -39,9 +39,9 @@ library test;
 //         /*error:LIST_ELEMENT_TYPE_NOT_ASSIGNABLE*/ 3
 //                                                    ^
 //
-// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:13: Error: A value of type 'int' can't be returned from a function with return type 'String'.
-//             x;
-//             ^
+// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:78: Error: A value of type 'int' can't be returned from a function with return type 'String'.
+//     Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
+//                                                                              ^
 //
 // pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the class 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
@@ -104,9 +104,9 @@ static method test() → void {
   {
     (core::int) → core::int l0 = (core::int x) → core::int => x;
     (core::int) → core::int l1 = (core::int x) → core::int => x.{core::num::+}(1){(core::num) → core::int};
-    (core::int) → core::String l2 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:13: Error: A value of type 'int' can't be returned from a function with return type 'String'.
-            x;
-            ^" in x as{TypeError} core::String;
+    (core::int) → core::String l2 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:78: Error: A value of type 'int' can't be returned from a function with return type 'String'.
+    Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
+                                                                             ^" in x as{TypeError} core::String;
     (core::int) → core::String l3 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
             .substring(3);
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.transformed.expect
index 0b7b001c7c8..62edb00a365 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.transformed.expect
@@ -39,9 +39,9 @@ library test;
 //         /*error:LIST_ELEMENT_TYPE_NOT_ASSIGNABLE*/ 3
 //                                                    ^
 //
-// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:13: Error: A value of type 'int' can't be returned from a function with return type 'String'.
-//             x;
-//             ^
+// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:78: Error: A value of type 'int' can't be returned from a function with return type 'String'.
+//     Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
+//                                                                              ^
 //
 // pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the class 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
@@ -104,9 +104,9 @@ static method test() → void {
   {
     (core::int) → core::int l0 = (core::int x) → core::int => x;
     (core::int) → core::int l1 = (core::int x) → core::int => x.{core::num::+}(1){(core::num) → core::int};
-    (core::int) → core::String l2 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:13: Error: A value of type 'int' can't be returned from a function with return type 'String'.
-            x;
-            ^" in x as{TypeError} core::String;
+    (core::int) → core::String l2 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:78: Error: A value of type 'int' can't be returned from a function with return type 'String'.
+    Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
+                                                                             ^" in x as{TypeError} core::String;
     (core::int) → core::String l3 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
             .substring(3);
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.expect
index d59ff065604..7cdb4561874 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.expect
@@ -39,9 +39,9 @@ library test;
 //         /*error:LIST_ELEMENT_TYPE_NOT_ASSIGNABLE*/ 3
 //                                                    ^
 //
-// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:13: Error: A value of type 'int' can't be returned from a function with return type 'String'.
-//             x;
-//             ^
+// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:78: Error: A value of type 'int' can't be returned from a function with return type 'String'.
+//     Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
+//                                                                              ^
 //
 // pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the class 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
@@ -104,9 +104,9 @@ static method test() → void {
   {
     (core::int) → core::int l0 = (core::int x) → core::int => x;
     (core::int) → core::int l1 = (core::int x) → core::int => x.{core::num::+}(1){(core::num) → core::int};
-    (core::int) → core::String l2 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:13: Error: A value of type 'int' can't be returned from a function with return type 'String'.
-            x;
-            ^" in x as{TypeError} core::String;
+    (core::int) → core::String l2 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:78: Error: A value of type 'int' can't be returned from a function with return type 'String'.
+    Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
+                                                                             ^" in x as{TypeError} core::String;
     (core::int) → core::String l3 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
             .substring(3);
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.modular.expect
index d59ff065604..7cdb4561874 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.modular.expect
@@ -39,9 +39,9 @@ library test;
 //         /*error:LIST_ELEMENT_TYPE_NOT_ASSIGNABLE*/ 3
 //                                                    ^
 //
-// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:13: Error: A value of type 'int' can't be returned from a function with return type 'String'.
-//             x;
-//             ^
+// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:78: Error: A value of type 'int' can't be returned from a function with return type 'String'.
+//     Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
+//                                                                              ^
 //
 // pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the class 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
@@ -104,9 +104,9 @@ static method test() → void {
   {
     (core::int) → core::int l0 = (core::int x) → core::int => x;
     (core::int) → core::int l1 = (core::int x) → core::int => x.{core::num::+}(1){(core::num) → core::int};
-    (core::int) → core::String l2 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:13: Error: A value of type 'int' can't be returned from a function with return type 'String'.
-            x;
-            ^" in x as{TypeError} core::String;
+    (core::int) → core::String l2 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:78: Error: A value of type 'int' can't be returned from a function with return type 'String'.
+    Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
+                                                                             ^" in x as{TypeError} core::String;
     (core::int) → core::String l3 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
             .substring(3);
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.transformed.expect
index 0b7b001c7c8..62edb00a365 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.weak.transformed.expect
@@ -39,9 +39,9 @@ library test;
 //         /*error:LIST_ELEMENT_TYPE_NOT_ASSIGNABLE*/ 3
 //                                                    ^
 //
-// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:13: Error: A value of type 'int' can't be returned from a function with return type 'String'.
-//             x;
-//             ^
+// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:78: Error: A value of type 'int' can't be returned from a function with return type 'String'.
+//     Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
+//                                                                              ^
 //
 // pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the class 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
@@ -104,9 +104,9 @@ static method test() → void {
   {
     (core::int) → core::int l0 = (core::int x) → core::int => x;
     (core::int) → core::int l1 = (core::int x) → core::int => x.{core::num::+}(1){(core::num) → core::int};
-    (core::int) → core::String l2 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:13: Error: A value of type 'int' can't be returned from a function with return type 'String'.
-            x;
-            ^" in x as{TypeError} core::String;
+    (core::int) → core::String l2 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:62:78: Error: A value of type 'int' can't be returned from a function with return type 'String'.
+    Function2<int, String> l2 =  /*@returnType=String*/ (/*@type=int*/ x) => x;
+                                                                             ^" in x as{TypeError} core::String;
     (core::int) → core::String l3 = (core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
             .substring(3);
diff --git a/pkg/front_end/testcases/inference/future_then_conditional2.dart b/pkg/front_end/testcases/inference/future_then_conditional2.dart
index 8349e099dc6..82987f2b132 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional2.dart
+++ b/pkg/front_end/testcases/inference/future_then_conditional2.dart
@@ -23,8 +23,8 @@ void test(MyFuture<bool> f) {
     return /*info:DOWN_CAST_COMPOSITE*/ await x ? 2 : new Future<int>.value(3);
   });
   Future<int> t5 = f. /*@typeArgs=int*/ /*@target=MyFuture.then*/ then(
-      /*error:INVALID_CAST_FUNCTION_EXPR*/
       /*@returnType=FutureOr<int>*/ (/*@type=bool*/ x) =>
+      // error:INVALID_CAST_FUNCTION_EXPR
           x ? 2 : new Future<int>.value(3));
   Future<int> t6 = f. /*@typeArgs=int*/ /*@target=MyFuture.then*/ then(
       /*@returnType=FutureOr<int>*/ (/*@type=bool*/ x) {
diff --git a/pkg/front_end/testcases/inference/future_then_ifNull2.dart b/pkg/front_end/testcases/inference/future_then_ifNull2.dart
index 7a126122556..b0330a1ba15 100644
--- a/pkg/front_end/testcases/inference/future_then_ifNull2.dart
+++ b/pkg/front_end/testcases/inference/future_then_ifNull2.dart
@@ -23,8 +23,8 @@ void test(MyFuture<int> f) {
     return /*info:DOWN_CAST_COMPOSITE*/ await x ?? new Future<int>.value(3);
   });
   Future<int> t5 = f. /*@typeArgs=int*/ /*@target=MyFuture.then*/ then(
-      /*error:INVALID_CAST_FUNCTION_EXPR*/
       /*@returnType=FutureOr<int>*/ (/*@type=int*/ x) =>
+      // error:INVALID_CAST_FUNCTION_EXPR
           x ?? new Future<int>.value(3));
   Future<int> t6 = f. /*@typeArgs=int*/ /*@target=MyFuture.then*/ then(
       /*@returnType=FutureOr<int>*/ (/*@type=int*/ x) {
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart
index 62d40902586..27ef717dd22 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart
@@ -71,24 +71,22 @@ test() {
 // That's legal because we're loosening parameter types.
 //
 // We do issue the inference error though, similar to generic function calls.
-  takeOON(/*error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE*/ new C()
-      . /*@target=C.m*/ m);
-  takeOOO(/*error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE*/ new C()
-      . /*@target=C.m*/ m);
+  // Error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE
+  takeOON(new C() . /*@target=C.m*/ m);
+  // Error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE
+  takeOOO(new C() . /*@target=C.m*/ m);
 
 // Note: this is a warning because a downcast of a method tear-off could work
 // in "normal" Dart, due to bivariance.
 //
 // We do issue the inference error though, similar to generic function calls.
-  takeOOI(/*error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE*/ new C()
-      . /*@target=C.m*/ m);
+  // Error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE
+  takeOOI(new C() . /*@target=C.m*/ m);
 
-  takeIDI(
-      /*error:COULD_NOT_INFER,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/ new C()
-          . /*@target=C.m*/ m);
-  takeDID(
-      /*error:COULD_NOT_INFER,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/ new C()
-          . /*@target=C.m*/ m);
+  // Error:COULD_NOT_INFER,error:ARGUMENT_TYPE_NOT_ASSIGNABLE
+  takeIDI(new C() . /*@target=C.m*/ m);
+  // Error:COULD_NOT_INFER,error:ARGUMENT_TYPE_NOT_ASSIGNABLE
+  takeDID(new C(). /*@target=C.m*/ m);
 }
 
 void takeIII(int fn(int a, int b)) {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.expect
index 97204fed07c..5c7dc08a94b 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.expect
@@ -58,31 +58,31 @@ library test /*isLegacy*/;
 //   takeOOO(/*error:COULD_NOT_INFER,error:INVALID_CAST_FUNCTION*/ min);
 //                                                                 ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:75:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:75:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:77:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:77:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:84:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:84:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:88:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-//           . /*@target=C.m*/ m);
-//                             ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+//   takeIDI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:91:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-//           . /*@target=C.m*/ m);
-//                             ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:89:36: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+//   takeDID(new C(). /*@target=C.m*/ m);
+//                                    ^
 //
 import self as self;
 import "dart:core" as core;
@@ -156,12 +156,12 @@ static method test() → dynamic {
   self::takeOON((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::num*);
   self::takeOOO((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::num*);
   self::takeOOI((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::int*);
-  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:88:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-          . /*@target=C.m*/ m);
-                            ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::double*, core::int*) →* core::int*);
-  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:91:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-          . /*@target=C.m*/ m);
-                            ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::int*, core::double*) →* core::double*);
+  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+  takeIDI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::double*, core::int*) →* core::int*);
+  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:89:36: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+  takeDID(new C(). /*@target=C.m*/ m);
+                                   ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::int*, core::double*) →* core::double*);
 }
 static method takeIII((core::int*, core::int*) →* core::int* fn) → void {}
 static method takeDDD((core::double*, core::double*) →* core::double* fn) → void {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.transformed.expect
index 97204fed07c..5c7dc08a94b 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.transformed.expect
@@ -58,31 +58,31 @@ library test /*isLegacy*/;
 //   takeOOO(/*error:COULD_NOT_INFER,error:INVALID_CAST_FUNCTION*/ min);
 //                                                                 ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:75:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:75:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:77:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:77:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:84:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:84:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:88:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-//           . /*@target=C.m*/ m);
-//                             ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+//   takeIDI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:91:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-//           . /*@target=C.m*/ m);
-//                             ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:89:36: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+//   takeDID(new C(). /*@target=C.m*/ m);
+//                                    ^
 //
 import self as self;
 import "dart:core" as core;
@@ -156,12 +156,12 @@ static method test() → dynamic {
   self::takeOON((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::num*);
   self::takeOOO((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::num*);
   self::takeOOI((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::int*);
-  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:88:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-          . /*@target=C.m*/ m);
-                            ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::double*, core::int*) →* core::int*);
-  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:91:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-          . /*@target=C.m*/ m);
-                            ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::int*, core::double*) →* core::double*);
+  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+  takeIDI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::double*, core::int*) →* core::int*);
+  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:89:36: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+  takeDID(new C(). /*@target=C.m*/ m);
+                                   ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::int*, core::double*) →* core::double*);
 }
 static method takeIII((core::int*, core::int*) →* core::int* fn) → void {}
 static method takeDDD((core::double*, core::double*) →* core::double* fn) → void {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.expect
index cfa3dae3744..7a861779f75 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.expect
@@ -54,31 +54,31 @@ library test /*isLegacy*/;
 //   takeOOO(/*error:COULD_NOT_INFER,error:INVALID_CAST_FUNCTION*/ min);
 //                                                                 ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:75:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:75:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:77:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:77:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:84:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:84:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:88:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-//           . /*@target=C.m*/ m);
-//                             ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+//   takeIDI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:91:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-//           . /*@target=C.m*/ m);
-//                             ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:89:36: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+//   takeDID(new C(). /*@target=C.m*/ m);
+//                                    ^
 //
 import self as self;
 import "dart:core" as core;
@@ -152,12 +152,12 @@ static method test() → dynamic {
   self::takeOON((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::num*);
   self::takeOOO((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::num*);
   self::takeOOI((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::int*);
-  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:88:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-          . /*@target=C.m*/ m);
-                            ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::double*, core::int*) →* core::int*);
-  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:91:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-          . /*@target=C.m*/ m);
-                            ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::int*, core::double*) →* core::double*);
+  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+  takeIDI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::double*, core::int*) →* core::int*);
+  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:89:36: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+  takeDID(new C(). /*@target=C.m*/ m);
+                                   ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::int*, core::double*) →* core::double*);
 }
 static method takeIII((core::int*, core::int*) →* core::int* fn) → void {}
 static method takeDDD((core::double*, core::double*) →* core::double* fn) → void {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.modular.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.modular.expect
index cfa3dae3744..7a861779f75 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.modular.expect
@@ -54,31 +54,31 @@ library test /*isLegacy*/;
 //   takeOOO(/*error:COULD_NOT_INFER,error:INVALID_CAST_FUNCTION*/ min);
 //                                                                 ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:75:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:75:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:77:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:77:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:84:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:84:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:88:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-//           . /*@target=C.m*/ m);
-//                             ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+//   takeIDI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:91:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-//           . /*@target=C.m*/ m);
-//                             ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:89:36: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+//   takeDID(new C(). /*@target=C.m*/ m);
+//                                    ^
 //
 import self as self;
 import "dart:core" as core;
@@ -152,12 +152,12 @@ static method test() → dynamic {
   self::takeOON((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::num*);
   self::takeOOO((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::num*);
   self::takeOOI((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::int*);
-  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:88:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-          . /*@target=C.m*/ m);
-                            ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::double*, core::int*) →* core::int*);
-  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:91:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-          . /*@target=C.m*/ m);
-                            ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::int*, core::double*) →* core::double*);
+  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+  takeIDI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::double*, core::int*) →* core::int*);
+  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:89:36: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+  takeDID(new C(). /*@target=C.m*/ m);
+                                   ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::int*, core::double*) →* core::double*);
 }
 static method takeIII((core::int*, core::int*) →* core::int* fn) → void {}
 static method takeDDD((core::double*, core::double*) →* core::double* fn) → void {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.transformed.expect
index cfa3dae3744..7a861779f75 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.weak.transformed.expect
@@ -54,31 +54,31 @@ library test /*isLegacy*/;
 //   takeOOO(/*error:COULD_NOT_INFER,error:INVALID_CAST_FUNCTION*/ min);
 //                                                                 ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:75:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:75:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:77:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:77:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:84:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:84:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:88:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-//           . /*@target=C.m*/ m);
-//                             ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+//   takeIDI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:91:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-//           . /*@target=C.m*/ m);
-//                             ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:89:36: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+//   takeDID(new C(). /*@target=C.m*/ m);
+//                                    ^
 //
 import self as self;
 import "dart:core" as core;
@@ -152,12 +152,12 @@ static method test() → dynamic {
   self::takeOON((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::num*);
   self::takeOOO((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::num*);
   self::takeOOI((new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::Object*>) as{TypeError,ForLegacy} (core::Object*, core::Object*) →* core::int*);
-  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:88:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-          . /*@target=C.m*/ m);
-                            ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::double*, core::int*) →* core::int*);
-  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:91:29: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-          . /*@target=C.m*/ m);
-                            ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::int*, core::double*) →* core::double*);
+  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+  takeIDI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::double*, core::int*) →* core::int*);
+  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart:89:36: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+  takeDID(new C(). /*@target=C.m*/ m);
+                                   ^" in (new self::C::•().{self::C::m}{<T extends core::num*>(T*, T*) →* T*}<core::num*>) as{TypeError,ForLegacy} (core::int*, core::double*) →* core::double*);
 }
 static method takeIII((core::int*, core::int*) →* core::int* fn) → void {}
 static method takeDDD((core::double*, core::double*) →* core::double* fn) → void {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart
index cf4d948f5c9..23233cb633e 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart
@@ -69,22 +69,22 @@ test() {
 // That's legal because we're loosening parameter types.
 //
 // We do issue the inference error though, similar to generic function calls.
-  takeOON(/*error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE*/ new C()
-      . /*@target=C.m*/ m);
-  takeOOO(/*error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE*/ new C()
-      . /*@target=C.m*/ m);
+  // Error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE
+  takeOON(new C() . /*@target=C.m*/ m);
+  // Error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE
+  takeOOO(new C() . /*@target=C.m*/ m);
 
 // Note: this is a warning because a downcast of a method tear-off could work
 // in "normal" Dart, due to bivariance.
 //
 // We do issue the inference error though, similar to generic function calls.
-  takeOOI(/*error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE*/ new C()
-      . /*@target=C.m*/ m);
+  // Error:COULD_NOT_INFER,info:DOWN_CAST_COMPOSITE
+  takeOOI(new C() . /*@target=C.m*/ m);
 
-  takeIDI(/*error:COULD_NOT_INFER,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/ new C()
-      . /*@target=C.m*/ m);
-  takeDID(/*error:COULD_NOT_INFER,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/ new C()
-      . /*@target=C.m*/ m);
+  // Error:COULD_NOT_INFER,error:ARGUMENT_TYPE_NOT_ASSIGNABLE
+  takeIDI(new C() . /*@target=C.m*/ m);
+  // Error:COULD_NOT_INFER,error:ARGUMENT_TYPE_NOT_ASSIGNABLE
+  takeDID(new C() . /*@target=C.m*/ m);
 }
 
 void takeIII(int fn(int a, int b)) {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.strong.expect
index 2bd297dbca5..0ac7b39f644 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.strong.expect
@@ -84,46 +84,46 @@ library test;
 //   takeOOO(/*error:COULD_NOT_INFER,error:INVALID_CAST_FUNCTION*/ min);
 //                                                                 ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-//       . /*@target=C.m*/ m);
-//                         ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+//   takeIDI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-//       . /*@target=C.m*/ m);
-//                         ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+//   takeDID(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
 import self as self;
 import "dart:core" as core;
@@ -202,24 +202,24 @@ static method test() → dynamic {
   self::takeDDN(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::double>);
   self::takeIIO(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::int>);
   self::takeDDO(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::double>);
-  self::takeOON(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+  self::takeOON(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
-  self::takeOOO(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+  takeOON(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
+  self::takeOOO(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
-  self::takeOOI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
+  takeOOO(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
+  self::takeOOI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::int);
-  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::double, core::int) → core::int);
-  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::int, core::double) → core::double);
+  takeOOI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::int);
+  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+  takeIDI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::double, core::int) → core::int);
+  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+  takeDID(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::int, core::double) → core::double);
 }
 static method takeIII((core::int, core::int) → core::int fn) → void {}
 static method takeDDD((core::double, core::double) → core::double fn) → void {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.strong.transformed.expect
index 2bd297dbca5..0ac7b39f644 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.strong.transformed.expect
@@ -84,46 +84,46 @@ library test;
 //   takeOOO(/*error:COULD_NOT_INFER,error:INVALID_CAST_FUNCTION*/ min);
 //                                                                 ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-//       . /*@target=C.m*/ m);
-//                         ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+//   takeIDI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-//       . /*@target=C.m*/ m);
-//                         ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+//   takeDID(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
 import self as self;
 import "dart:core" as core;
@@ -202,24 +202,24 @@ static method test() → dynamic {
   self::takeDDN(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::double>);
   self::takeIIO(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::int>);
   self::takeDDO(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::double>);
-  self::takeOON(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+  self::takeOON(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
-  self::takeOOO(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+  takeOON(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
+  self::takeOOO(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
-  self::takeOOI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
+  takeOOO(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
+  self::takeOOI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::int);
-  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::double, core::int) → core::int);
-  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::int, core::double) → core::double);
+  takeOOI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::int);
+  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+  takeIDI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::double, core::int) → core::int);
+  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+  takeDID(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::int, core::double) → core::double);
 }
 static method takeIII((core::int, core::int) → core::int fn) → void {}
 static method takeDDD((core::double, core::double) → core::double fn) → void {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.expect
index 84ad558ef30..ace5f3c8b3e 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.expect
@@ -84,46 +84,46 @@ library test;
 //   takeOOO(/*error:COULD_NOT_INFER,error:INVALID_CAST_FUNCTION*/ min);
 //                                                                 ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-//       . /*@target=C.m*/ m);
-//                         ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+//   takeIDI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-//       . /*@target=C.m*/ m);
-//                         ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+//   takeDID(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
 import self as self;
 import "dart:core" as core;
@@ -202,24 +202,24 @@ static method test() → dynamic {
   self::takeDDN(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::double>);
   self::takeIIO(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::int>);
   self::takeDDO(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::double>);
-  self::takeOON(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+  self::takeOON(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
-  self::takeOOO(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+  takeOON(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
+  self::takeOOO(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
-  self::takeOOI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
+  takeOOO(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
+  self::takeOOI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::int);
-  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::double, core::int) → core::int);
-  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::int, core::double) → core::double);
+  takeOOI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::int);
+  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+  takeIDI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::double, core::int) → core::int);
+  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+  takeDID(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::int, core::double) → core::double);
 }
 static method takeIII((core::int, core::int) → core::int fn) → void {}
 static method takeDDD((core::double, core::double) → core::double fn) → void {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.modular.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.modular.expect
index 84ad558ef30..ace5f3c8b3e 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.modular.expect
@@ -84,46 +84,46 @@ library test;
 //   takeOOO(/*error:COULD_NOT_INFER,error:INVALID_CAST_FUNCTION*/ min);
 //                                                                 ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-//       . /*@target=C.m*/ m);
-//                         ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+//   takeIDI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-//       . /*@target=C.m*/ m);
-//                         ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+//   takeDID(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
 import self as self;
 import "dart:core" as core;
@@ -202,24 +202,24 @@ static method test() → dynamic {
   self::takeDDN(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::double>);
   self::takeIIO(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::int>);
   self::takeDDO(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::double>);
-  self::takeOON(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+  self::takeOON(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
-  self::takeOOO(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+  takeOON(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
+  self::takeOOO(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
-  self::takeOOI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
+  takeOOO(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
+  self::takeOOI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::int);
-  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::double, core::int) → core::int);
-  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::int, core::double) → core::double);
+  takeOOI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::int);
+  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+  takeIDI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::double, core::int) → core::int);
+  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+  takeDID(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::int, core::double) → core::double);
 }
 static method takeIII((core::int, core::int) → core::int fn) → void {}
 static method takeDDD((core::double, core::double) → core::double fn) → void {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.transformed.expect
index 84ad558ef30..ace5f3c8b3e 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart.weak.transformed.expect
@@ -84,46 +84,46 @@ library test;
 //   takeOOO(/*error:COULD_NOT_INFER,error:INVALID_CAST_FUNCTION*/ min);
 //                                                                 ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOON(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOO(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: Inferred type argument 'Object' doesn't conform to the bound 'num' of the type variable 'T' on 'T Function<T extends num>(T, T)'.
 //  - 'Object' is from 'dart:core'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
 //  - 'Object' is from 'dart:core'.
-//       . /*@target=C.m*/ m);
-//                         ^
+//   takeOOI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-//       . /*@target=C.m*/ m);
-//                         ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+//   takeIDI(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
-// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-//       . /*@target=C.m*/ m);
-//                         ^
+// pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+//   takeDID(new C() . /*@target=C.m*/ m);
+//                                     ^
 //
 import self as self;
 import "dart:core" as core;
@@ -202,24 +202,24 @@ static method test() → dynamic {
   self::takeDDN(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::double>);
   self::takeIIO(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::int>);
   self::takeDDO(new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::double>);
-  self::takeOON(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+  self::takeOON(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:73:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
-  self::takeOOO(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
+  takeOON(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
+  self::takeOOO(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:75:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'num Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
-  self::takeOOI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:25: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
+  takeOOO(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::num);
+  self::takeOOI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:82:37: Error: The argument type 'Object Function(Object, Object)' can't be assigned to the parameter type 'int Function(Object, Object)'.
  - 'Object' is from 'dart:core'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::int);
-  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::double, core::int) → core::int);
-  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:25: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
-      . /*@target=C.m*/ m);
-                        ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::int, core::double) → core::double);
+  takeOOI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::Object>) as{TypeError} (core::Object, core::Object) → core::int);
+  self::takeIDI(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:85:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'int Function(double, int)'.
+  takeIDI(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::double, core::int) → core::int);
+  self::takeDID(invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation2.dart:87:37: Error: The argument type 'num Function(num, num)' can't be assigned to the parameter type 'double Function(int, double)'.
+  takeDID(new C() . /*@target=C.m*/ m);
+                                    ^" in (new self::C::•().{self::C::m}{<T extends core::num>(T, T) → T}<core::num>) as{TypeError} (core::int, core::double) → core::double);
 }
 static method takeIII((core::int, core::int) → core::int fn) → void {}
 static method takeDDD((core::double, core::double) → core::double fn) → void {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart
index b84cf0b7e48..12a4999c1cb 100644
--- a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart
+++ b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart
@@ -7,9 +7,8 @@ library test;
 
 void f(List<String> y) {
   Iterable<String> x = y. /*@typeArgs=String*/ /*@target=Iterable.map*/ map(
-      /*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/ /*@returnType=String*/ (String
-              z) =>
-          1.0);
+      // error:ARGUMENT_TYPE_NOT_ASSIGNABLE
+      /*@returnType=String*/ (String z) => 1.0);
 }
 
 main() {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.strong.expect
index c3b455d74e3..dcf91366da8 100644
--- a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.strong.expect
@@ -2,16 +2,16 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/generic_methods_inference_error.dart:12:11: Error: A value of type 'double' can't be returned from a function with return type 'String'.
-//           1.0);
-//           ^
+// pkg/front_end/testcases/inference/generic_methods_inference_error.dart:11:44: Error: A value of type 'double' can't be returned from a function with return type 'String'.
+//       /*@returnType=String*/ (String z) => 1.0);
+//                                            ^
 //
 import self as self;
 import "dart:core" as core;
 
 static method f(core::List<core::String> y) → void {
-  core::Iterable<core::String> x = y.{core::Iterable::map}<core::String>((core::String z) → core::String => invalid-expression "pkg/front_end/testcases/inference/generic_methods_inference_error.dart:12:11: Error: A value of type 'double' can't be returned from a function with return type 'String'.
-          1.0);
-          ^" in 1.0 as{TypeError} core::String){((core::String) → core::String) → core::Iterable<core::String>};
+  core::Iterable<core::String> x = y.{core::Iterable::map}<core::String>((core::String z) → core::String => invalid-expression "pkg/front_end/testcases/inference/generic_methods_inference_error.dart:11:44: Error: A value of type 'double' can't be returned from a function with return type 'String'.
+      /*@returnType=String*/ (String z) => 1.0);
+                                           ^" in 1.0 as{TypeError} core::String){((core::String) → core::String) → core::Iterable<core::String>};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.strong.transformed.expect
index c3b455d74e3..dcf91366da8 100644
--- a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.strong.transformed.expect
@@ -2,16 +2,16 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/generic_methods_inference_error.dart:12:11: Error: A value of type 'double' can't be returned from a function with return type 'String'.
-//           1.0);
-//           ^
+// pkg/front_end/testcases/inference/generic_methods_inference_error.dart:11:44: Error: A value of type 'double' can't be returned from a function with return type 'String'.
+//       /*@returnType=String*/ (String z) => 1.0);
+//                                            ^
 //
 import self as self;
 import "dart:core" as core;
 
 static method f(core::List<core::String> y) → void {
-  core::Iterable<core::String> x = y.{core::Iterable::map}<core::String>((core::String z) → core::String => invalid-expression "pkg/front_end/testcases/inference/generic_methods_inference_error.dart:12:11: Error: A value of type 'double' can't be returned from a function with return type 'String'.
-          1.0);
-          ^" in 1.0 as{TypeError} core::String){((core::String) → core::String) → core::Iterable<core::String>};
+  core::Iterable<core::String> x = y.{core::Iterable::map}<core::String>((core::String z) → core::String => invalid-expression "pkg/front_end/testcases/inference/generic_methods_inference_error.dart:11:44: Error: A value of type 'double' can't be returned from a function with return type 'String'.
+      /*@returnType=String*/ (String z) => 1.0);
+                                           ^" in 1.0 as{TypeError} core::String){((core::String) → core::String) → core::Iterable<core::String>};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.expect b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.expect
index c3b455d74e3..dcf91366da8 100644
--- a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.expect
@@ -2,16 +2,16 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/generic_methods_inference_error.dart:12:11: Error: A value of type 'double' can't be returned from a function with return type 'String'.
-//           1.0);
-//           ^
+// pkg/front_end/testcases/inference/generic_methods_inference_error.dart:11:44: Error: A value of type 'double' can't be returned from a function with return type 'String'.
+//       /*@returnType=String*/ (String z) => 1.0);
+//                                            ^
 //
 import self as self;
 import "dart:core" as core;
 
 static method f(core::List<core::String> y) → void {
-  core::Iterable<core::String> x = y.{core::Iterable::map}<core::String>((core::String z) → core::String => invalid-expression "pkg/front_end/testcases/inference/generic_methods_inference_error.dart:12:11: Error: A value of type 'double' can't be returned from a function with return type 'String'.
-          1.0);
-          ^" in 1.0 as{TypeError} core::String){((core::String) → core::String) → core::Iterable<core::String>};
+  core::Iterable<core::String> x = y.{core::Iterable::map}<core::String>((core::String z) → core::String => invalid-expression "pkg/front_end/testcases/inference/generic_methods_inference_error.dart:11:44: Error: A value of type 'double' can't be returned from a function with return type 'String'.
+      /*@returnType=String*/ (String z) => 1.0);
+                                           ^" in 1.0 as{TypeError} core::String){((core::String) → core::String) → core::Iterable<core::String>};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.modular.expect b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.modular.expect
index c3b455d74e3..dcf91366da8 100644
--- a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.modular.expect
@@ -2,16 +2,16 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/generic_methods_inference_error.dart:12:11: Error: A value of type 'double' can't be returned from a function with return type 'String'.
-//           1.0);
-//           ^
+// pkg/front_end/testcases/inference/generic_methods_inference_error.dart:11:44: Error: A value of type 'double' can't be returned from a function with return type 'String'.
+//       /*@returnType=String*/ (String z) => 1.0);
+//                                            ^
 //
 import self as self;
 import "dart:core" as core;
 
 static method f(core::List<core::String> y) → void {
-  core::Iterable<core::String> x = y.{core::Iterable::map}<core::String>((core::String z) → core::String => invalid-expression "pkg/front_end/testcases/inference/generic_methods_inference_error.dart:12:11: Error: A value of type 'double' can't be returned from a function with return type 'String'.
-          1.0);
-          ^" in 1.0 as{TypeError} core::String){((core::String) → core::String) → core::Iterable<core::String>};
+  core::Iterable<core::String> x = y.{core::Iterable::map}<core::String>((core::String z) → core::String => invalid-expression "pkg/front_end/testcases/inference/generic_methods_inference_error.dart:11:44: Error: A value of type 'double' can't be returned from a function with return type 'String'.
+      /*@returnType=String*/ (String z) => 1.0);
+                                           ^" in 1.0 as{TypeError} core::String){((core::String) → core::String) → core::Iterable<core::String>};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.transformed.expect
index c3b455d74e3..dcf91366da8 100644
--- a/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_inference_error.dart.weak.transformed.expect
@@ -2,16 +2,16 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/generic_methods_inference_error.dart:12:11: Error: A value of type 'double' can't be returned from a function with return type 'String'.
-//           1.0);
-//           ^
+// pkg/front_end/testcases/inference/generic_methods_inference_error.dart:11:44: Error: A value of type 'double' can't be returned from a function with return type 'String'.
+//       /*@returnType=String*/ (String z) => 1.0);
+//                                            ^
 //
 import self as self;
 import "dart:core" as core;
 
 static method f(core::List<core::String> y) → void {
-  core::Iterable<core::String> x = y.{core::Iterable::map}<core::String>((core::String z) → core::String => invalid-expression "pkg/front_end/testcases/inference/generic_methods_inference_error.dart:12:11: Error: A value of type 'double' can't be returned from a function with return type 'String'.
-          1.0);
-          ^" in 1.0 as{TypeError} core::String){((core::String) → core::String) → core::Iterable<core::String>};
+  core::Iterable<core::String> x = y.{core::Iterable::map}<core::String>((core::String z) → core::String => invalid-expression "pkg/front_end/testcases/inference/generic_methods_inference_error.dart:11:44: Error: A value of type 'double' can't be returned from a function with return type 'String'.
+      /*@returnType=String*/ (String z) => 1.0);
+                                           ^" in 1.0 as{TypeError} core::String){((core::String) → core::String) → core::Iterable<core::String>};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart
index e38dadb8d60..339e3dfb325 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart
@@ -26,8 +26,8 @@ class B<E> extends A<E> implements M {
 }
 
 foo() {
-  int y = /*error:INVALID_ASSIGNMENT*/ new /*@typeArgs=dynamic*/ B()
-      . /*@target=B.m*/ m(throw '', throw '');
+  // Error:INVALID_ASSIGNMENT
+  int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
   String z =
       new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
 }
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.strong.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.strong.expect
index 02b69ea8305..3b4d846f52d 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.strong.expect
@@ -2,9 +2,9 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:25: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//       . /*@target=B.m*/ m(throw '', throw '');
-//                         ^
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+//   int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
+//                                                          ^
 //
 import self as self;
 import "dart:core" as core;
@@ -37,9 +37,9 @@ class B<E extends core::Object? = dynamic> extends self::A<self::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:25: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-      . /*@target=B.m*/ m(throw '', throw '');
-                        ^" in new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String} as{TypeError} core::int;
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
+                                                         ^" in new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String} as{TypeError} core::int;
   core::String z = new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.strong.transformed.expect
index 02b69ea8305..3b4d846f52d 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.strong.transformed.expect
@@ -2,9 +2,9 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:25: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//       . /*@target=B.m*/ m(throw '', throw '');
-//                         ^
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+//   int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
+//                                                          ^
 //
 import self as self;
 import "dart:core" as core;
@@ -37,9 +37,9 @@ class B<E extends core::Object? = dynamic> extends self::A<self::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:25: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-      . /*@target=B.m*/ m(throw '', throw '');
-                        ^" in new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String} as{TypeError} core::int;
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
+                                                         ^" in new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String} as{TypeError} core::int;
   core::String z = new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.expect
index 02b69ea8305..3b4d846f52d 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.expect
@@ -2,9 +2,9 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:25: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//       . /*@target=B.m*/ m(throw '', throw '');
-//                         ^
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+//   int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
+//                                                          ^
 //
 import self as self;
 import "dart:core" as core;
@@ -37,9 +37,9 @@ class B<E extends core::Object? = dynamic> extends self::A<self::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:25: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-      . /*@target=B.m*/ m(throw '', throw '');
-                        ^" in new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String} as{TypeError} core::int;
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
+                                                         ^" in new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String} as{TypeError} core::int;
   core::String z = new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.modular.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.modular.expect
index 02b69ea8305..3b4d846f52d 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.modular.expect
@@ -2,9 +2,9 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:25: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//       . /*@target=B.m*/ m(throw '', throw '');
-//                         ^
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+//   int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
+//                                                          ^
 //
 import self as self;
 import "dart:core" as core;
@@ -37,9 +37,9 @@ class B<E extends core::Object? = dynamic> extends self::A<self::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:25: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-      . /*@target=B.m*/ m(throw '', throw '');
-                        ^" in new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String} as{TypeError} core::int;
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
+                                                         ^" in new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String} as{TypeError} core::int;
   core::String z = new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.transformed.expect
index 02b69ea8305..3b4d846f52d 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart.weak.transformed.expect
@@ -2,9 +2,9 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:25: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//       . /*@target=B.m*/ m(throw '', throw '');
-//                         ^
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+//   int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
+//                                                          ^
 //
 import self as self;
 import "dart:core" as core;
@@ -37,9 +37,9 @@ class B<E extends core::Object? = dynamic> extends self::A<self::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:25: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-      . /*@target=B.m*/ m(throw '', throw '');
-                        ^" in new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String} as{TypeError} core::int;
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_5.dart:30:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  int y = new /*@typeArgs=dynamic*/ B(). /*@target=B.m*/ m(throw '', throw '');
+                                                         ^" in new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String} as{TypeError} core::int;
   core::String z = new self::B::•<dynamic>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, dynamic) → dynamic) → core::String};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart
index 26c4c1b94a4..a5f55f12586 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart
@@ -22,8 +22,9 @@ class B<E> extends A<E> implements M {
 }
 
 foo() {
-  int y = /*error:INVALID_ASSIGNMENT*/ new B<String>()
+  int y = new B<String>()
       . /*@target=B.m*/ m(throw '', throw '')
+      // Error:INVALID_ASSIGNMENT
       . /*@target=A.value*/ value;
   String z = new B<String>()
       . /*@target=B.m*/ m(throw '', throw '')
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.expect
index 75a8311e53d..270692b6547 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.expect
@@ -2,7 +2,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
 //       . /*@target=A.value*/ value;
 //                             ^
 //
@@ -34,7 +34,7 @@ class B<E extends core::Object? = dynamic> extends self::A<self::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
       . /*@target=A.value*/ value;
                             ^" in new self::B::•<core::String>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → self::A<core::String>}.{self::A::value}{core::String} as{TypeError} core::int;
   core::String z = new self::B::•<core::String>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → self::A<core::String>}.{self::A::value}{core::String};
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.transformed.expect
index 75a8311e53d..270692b6547 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
 //       . /*@target=A.value*/ value;
 //                             ^
 //
@@ -34,7 +34,7 @@ class B<E extends core::Object? = dynamic> extends self::A<self::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
       . /*@target=A.value*/ value;
                             ^" in new self::B::•<core::String>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → self::A<core::String>}.{self::A::value}{core::String} as{TypeError} core::int;
   core::String z = new self::B::•<core::String>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → self::A<core::String>}.{self::A::value}{core::String};
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.expect
index 75a8311e53d..270692b6547 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.expect
@@ -2,7 +2,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
 //       . /*@target=A.value*/ value;
 //                             ^
 //
@@ -34,7 +34,7 @@ class B<E extends core::Object? = dynamic> extends self::A<self::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
       . /*@target=A.value*/ value;
                             ^" in new self::B::•<core::String>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → self::A<core::String>}.{self::A::value}{core::String} as{TypeError} core::int;
   core::String z = new self::B::•<core::String>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → self::A<core::String>}.{self::A::value}{core::String};
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.modular.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.modular.expect
index 75a8311e53d..270692b6547 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.modular.expect
@@ -2,7 +2,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
 //       . /*@target=A.value*/ value;
 //                             ^
 //
@@ -34,7 +34,7 @@ class B<E extends core::Object? = dynamic> extends self::A<self::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
       . /*@target=A.value*/ value;
                             ^" in new self::B::•<core::String>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → self::A<core::String>}.{self::A::value}{core::String} as{TypeError} core::int;
   core::String z = new self::B::•<core::String>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → self::A<core::String>}.{self::A::value}{core::String};
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.transformed.expect
index 75a8311e53d..270692b6547 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.weak.transformed.expect
@@ -2,7 +2,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
 //       . /*@target=A.value*/ value;
 //                             ^
 //
@@ -34,7 +34,7 @@ class B<E extends core::Object? = dynamic> extends self::A<self::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
       . /*@target=A.value*/ value;
                             ^" in new self::B::•<core::String>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → self::A<core::String>}.{self::A::value}{core::String} as{TypeError} core::int;
   core::String z = new self::B::•<core::String>().{self::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → self::A<core::String>}.{self::A::value}{core::String};
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.expect
index ef9304e10dc..1490285d019 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.expect
@@ -17,7 +17,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
 //       . /*@target=A.value*/ value;
 //                             ^
 //
@@ -49,7 +49,7 @@ class B<E extends core::Object? = dynamic> extends test::A<test::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
       . /*@target=A.value*/ value;
                             ^" in new test::B::•<core::String>().{test::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → test::A<core::String>}.{test::A::value}{core::String} as{TypeError} core::int;
   core::String z = new test::B::•<core::String>().{test::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → test::A<core::String>}.{test::A::value}{core::String};
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.transformed.expect
index ef9304e10dc..1490285d019 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.transformed.expect
@@ -17,7 +17,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
 //       . /*@target=A.value*/ value;
 //                             ^
 //
@@ -49,7 +49,7 @@ class B<E extends core::Object? = dynamic> extends test::A<test::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
       . /*@target=A.value*/ value;
                             ^" in new test::B::•<core::String>().{test::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → test::A<core::String>}.{test::A::value}{core::String} as{TypeError} core::int;
   core::String z = new test::B::•<core::String>().{test::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → test::A<core::String>}.{test::A::value}{core::String};
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.expect
index ef9304e10dc..1490285d019 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.expect
@@ -17,7 +17,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
 //       . /*@target=A.value*/ value;
 //                             ^
 //
@@ -49,7 +49,7 @@ class B<E extends core::Object? = dynamic> extends test::A<test::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
       . /*@target=A.value*/ value;
                             ^" in new test::B::•<core::String>().{test::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → test::A<core::String>}.{test::A::value}{core::String} as{TypeError} core::int;
   core::String z = new test::B::•<core::String>().{test::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → test::A<core::String>}.{test::A::value}{core::String};
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.modular.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.modular.expect
index ef9304e10dc..1490285d019 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.modular.expect
@@ -17,7 +17,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
 //       . /*@target=A.value*/ value;
 //                             ^
 //
@@ -49,7 +49,7 @@ class B<E extends core::Object? = dynamic> extends test::A<test::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
       . /*@target=A.value*/ value;
                             ^" in new test::B::•<core::String>().{test::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → test::A<core::String>}.{test::A::value}{core::String} as{TypeError} core::int;
   core::String z = new test::B::•<core::String>().{test::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → test::A<core::String>}.{test::A::value}{core::String};
diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.transformed.expect
index ef9304e10dc..1490285d019 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.weak.transformed.expect
@@ -17,7 +17,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+// pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
 //       . /*@target=A.value*/ value;
 //                             ^
 //
@@ -49,7 +49,7 @@ class B<E extends core::Object? = dynamic> extends test::A<test::B::E%> implemen
     return throw "";
 }
 static method foo() → dynamic {
-  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:27:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
+  core::int y = invalid-expression "pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart:28:29: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
       . /*@target=A.value*/ value;
                             ^" in new test::B::•<core::String>().{test::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → test::A<core::String>}.{test::A::value}{core::String} as{TypeError} core::int;
   core::String z = new test::B::•<core::String>().{test::B::m}(throw "", throw ""){(dynamic, (dynamic, core::int) → dynamic) → test::A<core::String>}.{test::A::value}{core::String};
diff --git a/pkg/front_end/testcases/nnbd/covariant_equals.dart b/pkg/front_end/testcases/nnbd/covariant_equals.dart
index b69bb3e2715..8615559be41 100644
--- a/pkg/front_end/testcases/nnbd/covariant_equals.dart
+++ b/pkg/front_end/testcases/nnbd/covariant_equals.dart
@@ -45,7 +45,7 @@ testNonNullable(A a, B b, C c_dynamic, C<int> c_int, C<String> c_string, D d) {
   c_int == c_dynamic; // error
   c_int == c_int; // ok
   c_int == c_string; // error
-  c_int == d; // ok}
+  c_int == d; // ok
 
   c_string == a; // error
   c_string == b; // error
@@ -96,7 +96,7 @@ testNullable(
   c_int == c_dynamic; // ok or error ?
   c_int == c_int; // ok
   c_int == c_string; // ok or error ?
-  c_int == d; // ok}
+  c_int == d; // ok
 
   c_string == a; // ok or error ?
   c_string == b; // ok or error ?
diff --git a/pkg/front_end/testcases/nnbd/not_definitely_unassigned_late_local_variables.dart b/pkg/front_end/testcases/nnbd/not_definitely_unassigned_late_local_variables.dart
index 19d24a43233..e732c3595a3 100644
--- a/pkg/front_end/testcases/nnbd/not_definitely_unassigned_late_local_variables.dart
+++ b/pkg/front_end/testcases/nnbd/not_definitely_unassigned_late_local_variables.dart
@@ -11,8 +11,8 @@ abstract class A<T> {
   foo() {
     late T value;
     late int intValue;
-    // The use of variable "value" below shouldn't be a compile-time
-    // error because it's late and not definitely unassigned.
+    // The use of variable "value" below shouldn't be
+    // a compile-time error because it's late and not definitely unassigned.
     var result = () {
       bar(value);
       barInt(intValue);
diff --git a/pkg/front_end/testcases/nnbd/required_named_parameter.dart b/pkg/front_end/testcases/nnbd/required_named_parameter.dart
index 625189d6672..388c7f5906c 100644
--- a/pkg/front_end/testcases/nnbd/required_named_parameter.dart
+++ b/pkg/front_end/testcases/nnbd/required_named_parameter.dart
@@ -2,14 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// Should be a compile-time error / warning.
-foo({required int parameter = 42}) {}
-foo2({int parameter}) {}
-foo3([int parameter]) {}
+foo({required int parameter = 42}) {} // error
+foo2({int parameter}) {} // error
+foo3([int parameter]) {} // error
 
-// Should be ok.
-bar({required int parameter}) {}
-bar2({int parameter = 42}) {}
-bar3([int parameter = 42]) {}
+bar({required int parameter}) {} // ok
+bar2({int parameter = 42}) {} // ok
+bar3([int parameter = 42]) {} // ok
 
 main() {}
diff --git a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.strong.expect b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.strong.expect
index a0419faf089..e954c503959 100644
--- a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.strong.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:19: Error: Named parameter 'parameter' is required and can't have a default value.
-// foo({required int parameter = 42}) {}
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:5:19: Error: Named parameter 'parameter' is required and can't have a default value.
+// foo({required int parameter = 42}) {} // error
 //                   ^^^^^^^^^
 //
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
+// foo2({int parameter}) {} // error
+//           ^^^^^^^^^
+//
 // pkg/front_end/testcases/nnbd/required_named_parameter.dart:7:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
 // Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo2({int parameter}) {}
-//           ^^^^^^^^^
-//
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:8:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
-// Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo3([int parameter]) {}
+// foo3([int parameter]) {} // error
 //           ^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.strong.transformed.expect
index a0419faf089..e954c503959 100644
--- a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.strong.transformed.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:19: Error: Named parameter 'parameter' is required and can't have a default value.
-// foo({required int parameter = 42}) {}
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:5:19: Error: Named parameter 'parameter' is required and can't have a default value.
+// foo({required int parameter = 42}) {} // error
 //                   ^^^^^^^^^
 //
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
+// foo2({int parameter}) {} // error
+//           ^^^^^^^^^
+//
 // pkg/front_end/testcases/nnbd/required_named_parameter.dart:7:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
 // Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo2({int parameter}) {}
-//           ^^^^^^^^^
-//
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:8:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
-// Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo3([int parameter]) {}
+// foo3([int parameter]) {} // error
 //           ^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.expect b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.expect
index a0419faf089..e954c503959 100644
--- a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:19: Error: Named parameter 'parameter' is required and can't have a default value.
-// foo({required int parameter = 42}) {}
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:5:19: Error: Named parameter 'parameter' is required and can't have a default value.
+// foo({required int parameter = 42}) {} // error
 //                   ^^^^^^^^^
 //
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
+// foo2({int parameter}) {} // error
+//           ^^^^^^^^^
+//
 // pkg/front_end/testcases/nnbd/required_named_parameter.dart:7:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
 // Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo2({int parameter}) {}
-//           ^^^^^^^^^
-//
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:8:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
-// Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo3([int parameter]) {}
+// foo3([int parameter]) {} // error
 //           ^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.modular.expect
index a0419faf089..e954c503959 100644
--- a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.modular.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:19: Error: Named parameter 'parameter' is required and can't have a default value.
-// foo({required int parameter = 42}) {}
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:5:19: Error: Named parameter 'parameter' is required and can't have a default value.
+// foo({required int parameter = 42}) {} // error
 //                   ^^^^^^^^^
 //
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
+// foo2({int parameter}) {} // error
+//           ^^^^^^^^^
+//
 // pkg/front_end/testcases/nnbd/required_named_parameter.dart:7:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
 // Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo2({int parameter}) {}
-//           ^^^^^^^^^
-//
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:8:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
-// Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo3([int parameter]) {}
+// foo3([int parameter]) {} // error
 //           ^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.outline.expect b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.outline.expect
index e99c0cc108a..3353f5ed17f 100644
--- a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.outline.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:19: Error: Named parameter 'parameter' is required and can't have a default value.
-// foo({required int parameter = 42}) {}
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:5:19: Error: Named parameter 'parameter' is required and can't have a default value.
+// foo({required int parameter = 42}) {} // error
 //                   ^^^^^^^^^
 //
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
+// foo2({int parameter}) {} // error
+//           ^^^^^^^^^
+//
 // pkg/front_end/testcases/nnbd/required_named_parameter.dart:7:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
 // Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo2({int parameter}) {}
-//           ^^^^^^^^^
-//
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:8:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
-// Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo3([int parameter]) {}
+// foo3([int parameter]) {} // error
 //           ^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.transformed.expect
index a0419faf089..e954c503959 100644
--- a/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/required_named_parameter.dart.weak.transformed.expect
@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:19: Error: Named parameter 'parameter' is required and can't have a default value.
-// foo({required int parameter = 42}) {}
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:5:19: Error: Named parameter 'parameter' is required and can't have a default value.
+// foo({required int parameter = 42}) {} // error
 //                   ^^^^^^^^^
 //
+// pkg/front_end/testcases/nnbd/required_named_parameter.dart:6:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
+// foo2({int parameter}) {} // error
+//           ^^^^^^^^^
+//
 // pkg/front_end/testcases/nnbd/required_named_parameter.dart:7:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
 // Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo2({int parameter}) {}
-//           ^^^^^^^^^
-//
-// pkg/front_end/testcases/nnbd/required_named_parameter.dart:8:11: Error: The parameter 'parameter' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
-// Try adding either an explicit non-'null' default value or the 'required' modifier.
-// foo3([int parameter]) {}
+// foo3([int parameter]) {} // error
 //           ^^^^^^^^^
 //
 import self as self;
diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart
index dd7752508b9..d45d468c69e 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart
@@ -15,8 +15,9 @@ bar() {}
 foo(int x, bool b) {
   switch (x) {
     // The only statement in the following case block doesn't complete normally
-    // for any of its possible execution paths, so it's not a compile-time
-    // error, even though the statement is not one of the list of statement that
+    // for any of its possible execution paths,
+    // so it's not a compile-time error, even though the statement is not one
+    // of the list of statement that
     // should end any case block in pre-NNBD state.
     case 42:
       b ? throw "hest" : throw "fisk";
diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.strong.expect b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.strong.expect
index 04c8a189a35..9c7e6dd00a1 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart:25:5: Error: Switch case may fall through to the next case.
+// pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart:26:5: Error: Switch case may fall through to the next case.
 //     case -42: // Error.
 //     ^
 //
diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.strong.transformed.expect
index 04c8a189a35..9c7e6dd00a1 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart:25:5: Error: Switch case may fall through to the next case.
+// pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart:26:5: Error: Switch case may fall through to the next case.
 //     case -42: // Error.
 //     ^
 //
diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.expect b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.expect
index 59f2ad27970..a9e416733cc 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart:25:5: Error: Switch case may fall through to the next case.
+// pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart:26:5: Error: Switch case may fall through to the next case.
 //     case -42: // Error.
 //     ^
 //
diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.modular.expect
index 59f2ad27970..a9e416733cc 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart:25:5: Error: Switch case may fall through to the next case.
+// pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart:26:5: Error: Switch case may fall through to the next case.
 //     case -42: // Error.
 //     ^
 //
diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.transformed.expect
index 59f2ad27970..a9e416733cc 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart.weak.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart:25:5: Error: Switch case may fall through to the next case.
+// pkg/front_end/testcases/nnbd/switch_redesign_fall_over.dart:26:5: Error: Switch case may fall through to the next case.
 //     case -42: // Error.
 //     ^
 //
diff --git a/pkg/front_end/testcases/nnbd_mixed/opt_out.dart b/pkg/front_end/testcases/nnbd_mixed/opt_out.dart
index 5e5ca5a2587..a13331be051 100644
--- a/pkg/front_end/testcases/nnbd_mixed/opt_out.dart
+++ b/pkg/front_end/testcases/nnbd_mixed/opt_out.dart
@@ -4,8 +4,8 @@
 
 // @dart=2.12
 
-// This file contains benign use of NNBD features that shouldn't result in
-// compile-time errors.
+// This file contains benign use of NNBD features
+// that shouldn't result in compile-time errors.
 
 import 'opt_out_lib.dart';
 
diff --git a/pkg/front_end/testcases/patterns/for_final_variable.dart b/pkg/front_end/testcases/patterns/for_final_variable.dart
index 6d554c73daa..0a5d05b5f41 100644
--- a/pkg/front_end/testcases/patterns/for_final_variable.dart
+++ b/pkg/front_end/testcases/patterns/for_final_variable.dart
@@ -3,11 +3,13 @@
 // BSD-style license that can be found in the LICENSE file.
 
 testFor() {
+  // Error
   for (final int i = 0; i < 3; i = i + 1) {
-    print(i); // Error
+    print(i);
   }
+  // Error
   for (final (int i) = 0; i < 3; i = i + 1) {
-    print(i); // Error
+    print(i);
   }
   for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) {
     print(i); // Error
diff --git a/pkg/front_end/testcases/patterns/for_final_variable.dart.strong.expect b/pkg/front_end/testcases/patterns/for_final_variable.dart.strong.expect
index 349164249fc..78231b930f7 100644
--- a/pkg/front_end/testcases/patterns/for_final_variable.dart.strong.expect
+++ b/pkg/front_end/testcases/patterns/for_final_variable.dart.strong.expect
@@ -2,82 +2,82 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:6:32: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:7:32: Error: Can't assign to the final variable 'i'.
 //   for (final int i = 0; i < 3; i = i + 1) {
 //                                ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:9:34: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:11:34: Error: Can't assign to the final variable 'i'.
 //   for (final (int i) = 0; i < 3; i = i + 1) {
 //                                  ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:12:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:14:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) {
 //             ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:15:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:17:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (int i, final String s) = (0, ''); i < 3; i = i + 1) {
 //                    ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:19:34: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:21:34: Error: Can't assign to the final variable 'i'.
 //     for (final int i = 0; i < 3; i = i + 1) i, // Error
 //                                  ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:22:36: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:24:36: Error: Can't assign to the final variable 'i'.
 //     for (final (int i) = 0; i < 3; i = i + 1) i, // Error
 //                                    ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:25:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:27:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) i, // Error
 //               ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:28:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:30:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (int i, final String s) = (0, ''); i < 3; i = i + 1) i, // Ok
 //                      ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:34:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:36:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:37:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:39:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:39:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:41:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (final int i, String s) in [(1, 'a'), (2, 'b'), (3, 'c')]) {
 //             ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:40:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:42:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:42:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:44:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (int i, final String s) in [(1, 'a'), (2, 'b'), (3, 'c')]) {
 //                    ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:46:36: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:48:36: Error: Can't assign to the final variable 'i'.
 //     for (final int i in [1, 2, 3]) i = i + 1 // Error
 //                                    ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:49:38: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:51:38: Error: Can't assign to the final variable 'i'.
 //     for (final (int i) in [1, 2, 3]) i = i + 1 // Error
 //                                      ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:52:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:54:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (final int i, String s) in [(1, 'a'), (2, 'b'), (3, 'c')])
 //               ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:53:7: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:55:7: Error: Can't assign to the final variable 'i'.
 //       i = i + 1 // Error
 //       ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:56:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:58:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (int i, final String s) in [(1, 'a'), (2, 'b'), (3, 'c')])
 //                      ^^^^^
@@ -86,7 +86,7 @@ import self as self;
 import "dart:core" as core;
 
 static method testFor() → dynamic {
-  for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:6:32: Error: Can't assign to the final variable 'i'.
+  for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:7:32: Error: Can't assign to the final variable 'i'.
   for (final int i = 0; i < 3; i = i + 1) {
                                ^") {
     core::print(i);
@@ -99,7 +99,7 @@ static method testFor() → dynamic {
         throw new core::StateError::•("Pattern matching error");
     }
     final core::int #t2 = i;
-    for (final core::int i = #t2; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:9:34: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = #t2; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:11:34: Error: Can't assign to the final variable 'i'.
   for (final (int i) = 0; i < 3; i = i + 1) {
                                  ^") {
       core::print(i);
@@ -143,7 +143,7 @@ static method testFor() → dynamic {
   }
   core::List<core::int> l1 = block {
     final core::List<core::int> #t19 = <core::int>[];
-    for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:19:34: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:21:34: Error: Can't assign to the final variable 'i'.
     for (final int i = 0; i < 3; i = i + 1) i, // Error
                                  ^")
       #t19.{core::List::add}{Invariant}(i){(core::int) → void};
@@ -157,7 +157,7 @@ static method testFor() → dynamic {
         throw new core::StateError::•("Pattern matching error");
     }
     final core::int #t22 = i;
-    for (final core::int i = #t22; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:22:36: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = #t22; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:24:36: Error: Can't assign to the final variable 'i'.
     for (final (int i) = 0; i < 3; i = i + 1) i, // Error
                                    ^")
       #t20.{core::List::add}{Invariant}(i){(core::int) → void};
@@ -201,7 +201,7 @@ static method testFor() → dynamic {
 }
 static method testForIn() → dynamic {
   for (final core::int i in <core::int>[1, 2, 3]) {
-    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:34:5: Error: Can't assign to the final variable 'i'.
+    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:36:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
   }
@@ -212,7 +212,7 @@ static method testForIn() → dynamic {
       if(!(#0#0 is core::int && (let final dynamic #t42 = i = #0#0 in true)))
         throw new core::StateError::•("Pattern matching error");
     }
-    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:37:5: Error: Can't assign to the final variable 'i'.
+    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:39:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
   }
@@ -228,7 +228,7 @@ static method testForIn() → dynamic {
       if(!((#1#1#isSet ?{core::int} #1#1{core::int} : let final dynamic #t44 = #1#1#isSet = true in #1#1 = #1#0.$1{core::int}) is core::int && (let final dynamic #t45 = i = #1#1#isSet ?{core::int} #1#1{core::int} : let final dynamic #t46 = #1#1#isSet = true in #1#1 = #1#0.$1{core::int} in true) && ((#1#2#isSet ?{core::String} #1#2{core::String} : let final dynamic #t47 = #1#2#isSet = true in #1#2 = #1#0.$2{core::String}) is core::String && (let final dynamic #t48 = s = #1#2#isSet ?{core::String} #1#2{core::String} : let final dynamic #t49 = #1#2#isSet = true in #1#2 = #1#0.$2{core::String} in true))))
         throw new core::StateError::•("Pattern matching error");
     }
-    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:40:5: Error: Can't assign to the final variable 'i'.
+    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:42:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
   }
@@ -249,7 +249,7 @@ static method testForIn() → dynamic {
   core::List<dynamic> l1 = block {
     final core::List<dynamic> #t57 = <dynamic>[];
     for (final core::int i in <core::int>[1, 2, 3])
-      #t57.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:46:36: Error: Can't assign to the final variable 'i'.
+      #t57.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:48:36: Error: Can't assign to the final variable 'i'.
     for (final int i in [1, 2, 3]) i = i + 1 // Error
                                    ^"){(dynamic) → void};
   } =>#t57;
@@ -262,7 +262,7 @@ static method testForIn() → dynamic {
         if(!(#3#0 is core::int && (let final dynamic #t60 = i = #3#0 in true)))
           throw new core::StateError::•("Pattern matching error");
       }
-      #t58.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:49:38: Error: Can't assign to the final variable 'i'.
+      #t58.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:51:38: Error: Can't assign to the final variable 'i'.
     for (final (int i) in [1, 2, 3]) i = i + 1 // Error
                                      ^"){(dynamic) → void};
     }
@@ -281,7 +281,7 @@ static method testForIn() → dynamic {
         if(!((#4#1#isSet ?{core::int} #4#1{core::int} : let final dynamic #t63 = #4#1#isSet = true in #4#1 = #4#0.$1{core::int}) is core::int && (let final dynamic #t64 = i = #4#1#isSet ?{core::int} #4#1{core::int} : let final dynamic #t65 = #4#1#isSet = true in #4#1 = #4#0.$1{core::int} in true) && ((#4#2#isSet ?{core::String} #4#2{core::String} : let final dynamic #t66 = #4#2#isSet = true in #4#2 = #4#0.$2{core::String}) is core::String && (let final dynamic #t67 = s = #4#2#isSet ?{core::String} #4#2{core::String} : let final dynamic #t68 = #4#2#isSet = true in #4#2 = #4#0.$2{core::String} in true))))
           throw new core::StateError::•("Pattern matching error");
       }
-      #t61.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:53:7: Error: Can't assign to the final variable 'i'.
+      #t61.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:55:7: Error: Can't assign to the final variable 'i'.
       i = i + 1 // Error
       ^"){(dynamic) → void};
     }
diff --git a/pkg/front_end/testcases/patterns/for_final_variable.dart.strong.transformed.expect b/pkg/front_end/testcases/patterns/for_final_variable.dart.strong.transformed.expect
index fa4a0a7c861..38e4c2b47cc 100644
--- a/pkg/front_end/testcases/patterns/for_final_variable.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/patterns/for_final_variable.dart.strong.transformed.expect
@@ -2,82 +2,82 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:6:32: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:7:32: Error: Can't assign to the final variable 'i'.
 //   for (final int i = 0; i < 3; i = i + 1) {
 //                                ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:9:34: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:11:34: Error: Can't assign to the final variable 'i'.
 //   for (final (int i) = 0; i < 3; i = i + 1) {
 //                                  ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:12:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:14:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) {
 //             ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:15:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:17:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (int i, final String s) = (0, ''); i < 3; i = i + 1) {
 //                    ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:19:34: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:21:34: Error: Can't assign to the final variable 'i'.
 //     for (final int i = 0; i < 3; i = i + 1) i, // Error
 //                                  ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:22:36: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:24:36: Error: Can't assign to the final variable 'i'.
 //     for (final (int i) = 0; i < 3; i = i + 1) i, // Error
 //                                    ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:25:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:27:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) i, // Error
 //               ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:28:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:30:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (int i, final String s) = (0, ''); i < 3; i = i + 1) i, // Ok
 //                      ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:34:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:36:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:37:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:39:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:39:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:41:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (final int i, String s) in [(1, 'a'), (2, 'b'), (3, 'c')]) {
 //             ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:40:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:42:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:42:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:44:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (int i, final String s) in [(1, 'a'), (2, 'b'), (3, 'c')]) {
 //                    ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:46:36: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:48:36: Error: Can't assign to the final variable 'i'.
 //     for (final int i in [1, 2, 3]) i = i + 1 // Error
 //                                    ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:49:38: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:51:38: Error: Can't assign to the final variable 'i'.
 //     for (final (int i) in [1, 2, 3]) i = i + 1 // Error
 //                                      ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:52:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:54:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (final int i, String s) in [(1, 'a'), (2, 'b'), (3, 'c')])
 //               ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:53:7: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:55:7: Error: Can't assign to the final variable 'i'.
 //       i = i + 1 // Error
 //       ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:56:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:58:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (int i, final String s) in [(1, 'a'), (2, 'b'), (3, 'c')])
 //                      ^^^^^
@@ -86,7 +86,7 @@ import self as self;
 import "dart:core" as core;
 
 static method testFor() → dynamic {
-  for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:6:32: Error: Can't assign to the final variable 'i'.
+  for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:7:32: Error: Can't assign to the final variable 'i'.
   for (final int i = 0; i < 3; i = i + 1) {
                                ^") {
     core::print(i);
@@ -99,7 +99,7 @@ static method testFor() → dynamic {
         throw new core::StateError::•("Pattern matching error");
     }
     final core::int #t2 = i;
-    for (final core::int i = #t2; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:9:34: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = #t2; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:11:34: Error: Can't assign to the final variable 'i'.
   for (final (int i) = 0; i < 3; i = i + 1) {
                                  ^") {
       core::print(i);
@@ -143,7 +143,7 @@ static method testFor() → dynamic {
   }
   core::List<core::int> l1 = block {
     final core::List<core::int> #t19 = core::_GrowableList::•<core::int>(0);
-    for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:19:34: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:21:34: Error: Can't assign to the final variable 'i'.
     for (final int i = 0; i < 3; i = i + 1) i, // Error
                                  ^")
       #t19.{core::List::add}{Invariant}(i){(core::int) → void};
@@ -157,7 +157,7 @@ static method testFor() → dynamic {
         throw new core::StateError::•("Pattern matching error");
     }
     final core::int #t22 = i;
-    for (final core::int i = #t22; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:22:36: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = #t22; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:24:36: Error: Can't assign to the final variable 'i'.
     for (final (int i) = 0; i < 3; i = i + 1) i, // Error
                                    ^")
       #t20.{core::List::add}{Invariant}(i){(core::int) → void};
@@ -205,7 +205,7 @@ static method testForIn() → dynamic {
     for (; :sync-for-iterator.{core::Iterator::moveNext}(){() → core::bool}; ) {
       final core::int i = :sync-for-iterator.{core::Iterator::current}{core::int};
       {
-        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:34:5: Error: Can't assign to the final variable 'i'.
+        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:36:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
       }
@@ -222,7 +222,7 @@ static method testForIn() → dynamic {
           if(!(#0#0 is core::int && (let final core::int #t42 = i = #0#0 in true)))
             throw new core::StateError::•("Pattern matching error");
         }
-        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:37:5: Error: Can't assign to the final variable 'i'.
+        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:39:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
       }
@@ -244,7 +244,7 @@ static method testForIn() → dynamic {
           if(!((#1#1#isSet ?{core::int} #1#1{core::int} : let final core::bool* #t44 = #1#1#isSet = true in #1#1 = #1#0.$1{core::int}) is core::int && (let final core::int #t45 = i = #1#1#isSet ?{core::int} #1#1{core::int} : let final core::bool* #t46 = #1#1#isSet = true in #1#1 = #1#0.$1{core::int} in true) && ((#1#2#isSet ?{core::String} #1#2{core::String} : let final core::bool* #t47 = #1#2#isSet = true in #1#2 = #1#0.$2{core::String}) is core::String && (let final core::String #t48 = s = #1#2#isSet ?{core::String} #1#2{core::String} : let final core::bool* #t49 = #1#2#isSet = true in #1#2 = #1#0.$2{core::String} in true))))
             throw new core::StateError::•("Pattern matching error");
         }
-        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:40:5: Error: Can't assign to the final variable 'i'.
+        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:42:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
       }
@@ -276,7 +276,7 @@ static method testForIn() → dynamic {
       synthesized core::Iterator<core::int> :sync-for-iterator = core::_GrowableList::_literal3<core::int>(1, 2, 3).{core::Iterable::iterator}{core::Iterator<core::int>};
       for (; :sync-for-iterator.{core::Iterator::moveNext}(){() → core::bool}; ) {
         final core::int i = :sync-for-iterator.{core::Iterator::current}{core::int};
-        #t57.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:46:36: Error: Can't assign to the final variable 'i'.
+        #t57.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:48:36: Error: Can't assign to the final variable 'i'.
     for (final int i in [1, 2, 3]) i = i + 1 // Error
                                    ^"){(dynamic) → void};
       }
@@ -295,7 +295,7 @@ static method testForIn() → dynamic {
             if(!(#3#0 is core::int && (let final core::int #t60 = i = #3#0 in true)))
               throw new core::StateError::•("Pattern matching error");
           }
-          #t58.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:49:38: Error: Can't assign to the final variable 'i'.
+          #t58.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:51:38: Error: Can't assign to the final variable 'i'.
     for (final (int i) in [1, 2, 3]) i = i + 1 // Error
                                      ^"){(dynamic) → void};
         }
@@ -320,7 +320,7 @@ static method testForIn() → dynamic {
             if(!((#4#1#isSet ?{core::int} #4#1{core::int} : let final core::bool* #t63 = #4#1#isSet = true in #4#1 = #4#0.$1{core::int}) is core::int && (let final core::int #t64 = i = #4#1#isSet ?{core::int} #4#1{core::int} : let final core::bool* #t65 = #4#1#isSet = true in #4#1 = #4#0.$1{core::int} in true) && ((#4#2#isSet ?{core::String} #4#2{core::String} : let final core::bool* #t66 = #4#2#isSet = true in #4#2 = #4#0.$2{core::String}) is core::String && (let final core::String #t67 = s = #4#2#isSet ?{core::String} #4#2{core::String} : let final core::bool* #t68 = #4#2#isSet = true in #4#2 = #4#0.$2{core::String} in true))))
               throw new core::StateError::•("Pattern matching error");
           }
-          #t61.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:53:7: Error: Can't assign to the final variable 'i'.
+          #t61.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:55:7: Error: Can't assign to the final variable 'i'.
       i = i + 1 // Error
       ^"){(dynamic) → void};
         }
@@ -354,20 +354,20 @@ static method testForIn() → dynamic {
 
 
 Extra constant evaluation status:
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:12:38 -> RecordConstant(const (0, ""))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:15:38 -> RecordConstant(const (0, ""))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:25:40 -> RecordConstant(const (0, ""))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:28:40 -> RecordConstant(const (0, ""))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:39:40 -> RecordConstant(const (1, "a"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:39:50 -> RecordConstant(const (2, "b"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:39:60 -> RecordConstant(const (3, "c"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:42:40 -> RecordConstant(const (1, "a"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:42:50 -> RecordConstant(const (2, "b"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:42:60 -> RecordConstant(const (3, "c"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:52:42 -> RecordConstant(const (1, "a"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:52:52 -> RecordConstant(const (2, "b"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:52:62 -> RecordConstant(const (3, "c"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:56:42 -> RecordConstant(const (1, "a"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:56:52 -> RecordConstant(const (2, "b"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:56:62 -> RecordConstant(const (3, "c"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:14:38 -> RecordConstant(const (0, ""))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:17:38 -> RecordConstant(const (0, ""))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:27:40 -> RecordConstant(const (0, ""))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:30:40 -> RecordConstant(const (0, ""))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:41:40 -> RecordConstant(const (1, "a"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:41:50 -> RecordConstant(const (2, "b"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:41:60 -> RecordConstant(const (3, "c"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:44:40 -> RecordConstant(const (1, "a"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:44:50 -> RecordConstant(const (2, "b"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:44:60 -> RecordConstant(const (3, "c"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:54:42 -> RecordConstant(const (1, "a"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:54:52 -> RecordConstant(const (2, "b"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:54:62 -> RecordConstant(const (3, "c"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:58:42 -> RecordConstant(const (1, "a"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:58:52 -> RecordConstant(const (2, "b"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:58:62 -> RecordConstant(const (3, "c"))
 Extra constant evaluation: evaluated: 564, effectively constant: 16
diff --git a/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.expect b/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.expect
index 349164249fc..78231b930f7 100644
--- a/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.expect
+++ b/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.expect
@@ -2,82 +2,82 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:6:32: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:7:32: Error: Can't assign to the final variable 'i'.
 //   for (final int i = 0; i < 3; i = i + 1) {
 //                                ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:9:34: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:11:34: Error: Can't assign to the final variable 'i'.
 //   for (final (int i) = 0; i < 3; i = i + 1) {
 //                                  ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:12:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:14:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) {
 //             ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:15:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:17:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (int i, final String s) = (0, ''); i < 3; i = i + 1) {
 //                    ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:19:34: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:21:34: Error: Can't assign to the final variable 'i'.
 //     for (final int i = 0; i < 3; i = i + 1) i, // Error
 //                                  ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:22:36: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:24:36: Error: Can't assign to the final variable 'i'.
 //     for (final (int i) = 0; i < 3; i = i + 1) i, // Error
 //                                    ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:25:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:27:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) i, // Error
 //               ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:28:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:30:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (int i, final String s) = (0, ''); i < 3; i = i + 1) i, // Ok
 //                      ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:34:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:36:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:37:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:39:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:39:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:41:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (final int i, String s) in [(1, 'a'), (2, 'b'), (3, 'c')]) {
 //             ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:40:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:42:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:42:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:44:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (int i, final String s) in [(1, 'a'), (2, 'b'), (3, 'c')]) {
 //                    ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:46:36: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:48:36: Error: Can't assign to the final variable 'i'.
 //     for (final int i in [1, 2, 3]) i = i + 1 // Error
 //                                    ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:49:38: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:51:38: Error: Can't assign to the final variable 'i'.
 //     for (final (int i) in [1, 2, 3]) i = i + 1 // Error
 //                                      ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:52:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:54:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (final int i, String s) in [(1, 'a'), (2, 'b'), (3, 'c')])
 //               ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:53:7: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:55:7: Error: Can't assign to the final variable 'i'.
 //       i = i + 1 // Error
 //       ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:56:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:58:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (int i, final String s) in [(1, 'a'), (2, 'b'), (3, 'c')])
 //                      ^^^^^
@@ -86,7 +86,7 @@ import self as self;
 import "dart:core" as core;
 
 static method testFor() → dynamic {
-  for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:6:32: Error: Can't assign to the final variable 'i'.
+  for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:7:32: Error: Can't assign to the final variable 'i'.
   for (final int i = 0; i < 3; i = i + 1) {
                                ^") {
     core::print(i);
@@ -99,7 +99,7 @@ static method testFor() → dynamic {
         throw new core::StateError::•("Pattern matching error");
     }
     final core::int #t2 = i;
-    for (final core::int i = #t2; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:9:34: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = #t2; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:11:34: Error: Can't assign to the final variable 'i'.
   for (final (int i) = 0; i < 3; i = i + 1) {
                                  ^") {
       core::print(i);
@@ -143,7 +143,7 @@ static method testFor() → dynamic {
   }
   core::List<core::int> l1 = block {
     final core::List<core::int> #t19 = <core::int>[];
-    for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:19:34: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:21:34: Error: Can't assign to the final variable 'i'.
     for (final int i = 0; i < 3; i = i + 1) i, // Error
                                  ^")
       #t19.{core::List::add}{Invariant}(i){(core::int) → void};
@@ -157,7 +157,7 @@ static method testFor() → dynamic {
         throw new core::StateError::•("Pattern matching error");
     }
     final core::int #t22 = i;
-    for (final core::int i = #t22; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:22:36: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = #t22; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:24:36: Error: Can't assign to the final variable 'i'.
     for (final (int i) = 0; i < 3; i = i + 1) i, // Error
                                    ^")
       #t20.{core::List::add}{Invariant}(i){(core::int) → void};
@@ -201,7 +201,7 @@ static method testFor() → dynamic {
 }
 static method testForIn() → dynamic {
   for (final core::int i in <core::int>[1, 2, 3]) {
-    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:34:5: Error: Can't assign to the final variable 'i'.
+    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:36:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
   }
@@ -212,7 +212,7 @@ static method testForIn() → dynamic {
       if(!(#0#0 is core::int && (let final dynamic #t42 = i = #0#0 in true)))
         throw new core::StateError::•("Pattern matching error");
     }
-    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:37:5: Error: Can't assign to the final variable 'i'.
+    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:39:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
   }
@@ -228,7 +228,7 @@ static method testForIn() → dynamic {
       if(!((#1#1#isSet ?{core::int} #1#1{core::int} : let final dynamic #t44 = #1#1#isSet = true in #1#1 = #1#0.$1{core::int}) is core::int && (let final dynamic #t45 = i = #1#1#isSet ?{core::int} #1#1{core::int} : let final dynamic #t46 = #1#1#isSet = true in #1#1 = #1#0.$1{core::int} in true) && ((#1#2#isSet ?{core::String} #1#2{core::String} : let final dynamic #t47 = #1#2#isSet = true in #1#2 = #1#0.$2{core::String}) is core::String && (let final dynamic #t48 = s = #1#2#isSet ?{core::String} #1#2{core::String} : let final dynamic #t49 = #1#2#isSet = true in #1#2 = #1#0.$2{core::String} in true))))
         throw new core::StateError::•("Pattern matching error");
     }
-    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:40:5: Error: Can't assign to the final variable 'i'.
+    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:42:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
   }
@@ -249,7 +249,7 @@ static method testForIn() → dynamic {
   core::List<dynamic> l1 = block {
     final core::List<dynamic> #t57 = <dynamic>[];
     for (final core::int i in <core::int>[1, 2, 3])
-      #t57.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:46:36: Error: Can't assign to the final variable 'i'.
+      #t57.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:48:36: Error: Can't assign to the final variable 'i'.
     for (final int i in [1, 2, 3]) i = i + 1 // Error
                                    ^"){(dynamic) → void};
   } =>#t57;
@@ -262,7 +262,7 @@ static method testForIn() → dynamic {
         if(!(#3#0 is core::int && (let final dynamic #t60 = i = #3#0 in true)))
           throw new core::StateError::•("Pattern matching error");
       }
-      #t58.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:49:38: Error: Can't assign to the final variable 'i'.
+      #t58.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:51:38: Error: Can't assign to the final variable 'i'.
     for (final (int i) in [1, 2, 3]) i = i + 1 // Error
                                      ^"){(dynamic) → void};
     }
@@ -281,7 +281,7 @@ static method testForIn() → dynamic {
         if(!((#4#1#isSet ?{core::int} #4#1{core::int} : let final dynamic #t63 = #4#1#isSet = true in #4#1 = #4#0.$1{core::int}) is core::int && (let final dynamic #t64 = i = #4#1#isSet ?{core::int} #4#1{core::int} : let final dynamic #t65 = #4#1#isSet = true in #4#1 = #4#0.$1{core::int} in true) && ((#4#2#isSet ?{core::String} #4#2{core::String} : let final dynamic #t66 = #4#2#isSet = true in #4#2 = #4#0.$2{core::String}) is core::String && (let final dynamic #t67 = s = #4#2#isSet ?{core::String} #4#2{core::String} : let final dynamic #t68 = #4#2#isSet = true in #4#2 = #4#0.$2{core::String} in true))))
           throw new core::StateError::•("Pattern matching error");
       }
-      #t61.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:53:7: Error: Can't assign to the final variable 'i'.
+      #t61.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:55:7: Error: Can't assign to the final variable 'i'.
       i = i + 1 // Error
       ^"){(dynamic) → void};
     }
diff --git a/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.modular.expect b/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.modular.expect
index 349164249fc..78231b930f7 100644
--- a/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.modular.expect
@@ -2,82 +2,82 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:6:32: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:7:32: Error: Can't assign to the final variable 'i'.
 //   for (final int i = 0; i < 3; i = i + 1) {
 //                                ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:9:34: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:11:34: Error: Can't assign to the final variable 'i'.
 //   for (final (int i) = 0; i < 3; i = i + 1) {
 //                                  ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:12:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:14:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) {
 //             ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:15:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:17:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (int i, final String s) = (0, ''); i < 3; i = i + 1) {
 //                    ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:19:34: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:21:34: Error: Can't assign to the final variable 'i'.
 //     for (final int i = 0; i < 3; i = i + 1) i, // Error
 //                                  ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:22:36: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:24:36: Error: Can't assign to the final variable 'i'.
 //     for (final (int i) = 0; i < 3; i = i + 1) i, // Error
 //                                    ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:25:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:27:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) i, // Error
 //               ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:28:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:30:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (int i, final String s) = (0, ''); i < 3; i = i + 1) i, // Ok
 //                      ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:34:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:36:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:37:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:39:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:39:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:41:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (final int i, String s) in [(1, 'a'), (2, 'b'), (3, 'c')]) {
 //             ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:40:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:42:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:42:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:44:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (int i, final String s) in [(1, 'a'), (2, 'b'), (3, 'c')]) {
 //                    ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:46:36: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:48:36: Error: Can't assign to the final variable 'i'.
 //     for (final int i in [1, 2, 3]) i = i + 1 // Error
 //                                    ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:49:38: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:51:38: Error: Can't assign to the final variable 'i'.
 //     for (final (int i) in [1, 2, 3]) i = i + 1 // Error
 //                                      ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:52:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:54:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (final int i, String s) in [(1, 'a'), (2, 'b'), (3, 'c')])
 //               ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:53:7: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:55:7: Error: Can't assign to the final variable 'i'.
 //       i = i + 1 // Error
 //       ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:56:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:58:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (int i, final String s) in [(1, 'a'), (2, 'b'), (3, 'c')])
 //                      ^^^^^
@@ -86,7 +86,7 @@ import self as self;
 import "dart:core" as core;
 
 static method testFor() → dynamic {
-  for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:6:32: Error: Can't assign to the final variable 'i'.
+  for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:7:32: Error: Can't assign to the final variable 'i'.
   for (final int i = 0; i < 3; i = i + 1) {
                                ^") {
     core::print(i);
@@ -99,7 +99,7 @@ static method testFor() → dynamic {
         throw new core::StateError::•("Pattern matching error");
     }
     final core::int #t2 = i;
-    for (final core::int i = #t2; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:9:34: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = #t2; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:11:34: Error: Can't assign to the final variable 'i'.
   for (final (int i) = 0; i < 3; i = i + 1) {
                                  ^") {
       core::print(i);
@@ -143,7 +143,7 @@ static method testFor() → dynamic {
   }
   core::List<core::int> l1 = block {
     final core::List<core::int> #t19 = <core::int>[];
-    for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:19:34: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:21:34: Error: Can't assign to the final variable 'i'.
     for (final int i = 0; i < 3; i = i + 1) i, // Error
                                  ^")
       #t19.{core::List::add}{Invariant}(i){(core::int) → void};
@@ -157,7 +157,7 @@ static method testFor() → dynamic {
         throw new core::StateError::•("Pattern matching error");
     }
     final core::int #t22 = i;
-    for (final core::int i = #t22; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:22:36: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = #t22; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:24:36: Error: Can't assign to the final variable 'i'.
     for (final (int i) = 0; i < 3; i = i + 1) i, // Error
                                    ^")
       #t20.{core::List::add}{Invariant}(i){(core::int) → void};
@@ -201,7 +201,7 @@ static method testFor() → dynamic {
 }
 static method testForIn() → dynamic {
   for (final core::int i in <core::int>[1, 2, 3]) {
-    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:34:5: Error: Can't assign to the final variable 'i'.
+    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:36:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
   }
@@ -212,7 +212,7 @@ static method testForIn() → dynamic {
       if(!(#0#0 is core::int && (let final dynamic #t42 = i = #0#0 in true)))
         throw new core::StateError::•("Pattern matching error");
     }
-    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:37:5: Error: Can't assign to the final variable 'i'.
+    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:39:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
   }
@@ -228,7 +228,7 @@ static method testForIn() → dynamic {
       if(!((#1#1#isSet ?{core::int} #1#1{core::int} : let final dynamic #t44 = #1#1#isSet = true in #1#1 = #1#0.$1{core::int}) is core::int && (let final dynamic #t45 = i = #1#1#isSet ?{core::int} #1#1{core::int} : let final dynamic #t46 = #1#1#isSet = true in #1#1 = #1#0.$1{core::int} in true) && ((#1#2#isSet ?{core::String} #1#2{core::String} : let final dynamic #t47 = #1#2#isSet = true in #1#2 = #1#0.$2{core::String}) is core::String && (let final dynamic #t48 = s = #1#2#isSet ?{core::String} #1#2{core::String} : let final dynamic #t49 = #1#2#isSet = true in #1#2 = #1#0.$2{core::String} in true))))
         throw new core::StateError::•("Pattern matching error");
     }
-    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:40:5: Error: Can't assign to the final variable 'i'.
+    invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:42:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
   }
@@ -249,7 +249,7 @@ static method testForIn() → dynamic {
   core::List<dynamic> l1 = block {
     final core::List<dynamic> #t57 = <dynamic>[];
     for (final core::int i in <core::int>[1, 2, 3])
-      #t57.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:46:36: Error: Can't assign to the final variable 'i'.
+      #t57.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:48:36: Error: Can't assign to the final variable 'i'.
     for (final int i in [1, 2, 3]) i = i + 1 // Error
                                    ^"){(dynamic) → void};
   } =>#t57;
@@ -262,7 +262,7 @@ static method testForIn() → dynamic {
         if(!(#3#0 is core::int && (let final dynamic #t60 = i = #3#0 in true)))
           throw new core::StateError::•("Pattern matching error");
       }
-      #t58.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:49:38: Error: Can't assign to the final variable 'i'.
+      #t58.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:51:38: Error: Can't assign to the final variable 'i'.
     for (final (int i) in [1, 2, 3]) i = i + 1 // Error
                                      ^"){(dynamic) → void};
     }
@@ -281,7 +281,7 @@ static method testForIn() → dynamic {
         if(!((#4#1#isSet ?{core::int} #4#1{core::int} : let final dynamic #t63 = #4#1#isSet = true in #4#1 = #4#0.$1{core::int}) is core::int && (let final dynamic #t64 = i = #4#1#isSet ?{core::int} #4#1{core::int} : let final dynamic #t65 = #4#1#isSet = true in #4#1 = #4#0.$1{core::int} in true) && ((#4#2#isSet ?{core::String} #4#2{core::String} : let final dynamic #t66 = #4#2#isSet = true in #4#2 = #4#0.$2{core::String}) is core::String && (let final dynamic #t67 = s = #4#2#isSet ?{core::String} #4#2{core::String} : let final dynamic #t68 = #4#2#isSet = true in #4#2 = #4#0.$2{core::String} in true))))
           throw new core::StateError::•("Pattern matching error");
       }
-      #t61.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:53:7: Error: Can't assign to the final variable 'i'.
+      #t61.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:55:7: Error: Can't assign to the final variable 'i'.
       i = i + 1 // Error
       ^"){(dynamic) → void};
     }
diff --git a/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.transformed.expect b/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.transformed.expect
index fa4a0a7c861..38e4c2b47cc 100644
--- a/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/patterns/for_final_variable.dart.weak.transformed.expect
@@ -2,82 +2,82 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:6:32: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:7:32: Error: Can't assign to the final variable 'i'.
 //   for (final int i = 0; i < 3; i = i + 1) {
 //                                ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:9:34: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:11:34: Error: Can't assign to the final variable 'i'.
 //   for (final (int i) = 0; i < 3; i = i + 1) {
 //                                  ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:12:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:14:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) {
 //             ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:15:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:17:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (int i, final String s) = (0, ''); i < 3; i = i + 1) {
 //                    ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:19:34: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:21:34: Error: Can't assign to the final variable 'i'.
 //     for (final int i = 0; i < 3; i = i + 1) i, // Error
 //                                  ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:22:36: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:24:36: Error: Can't assign to the final variable 'i'.
 //     for (final (int i) = 0; i < 3; i = i + 1) i, // Error
 //                                    ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:25:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:27:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (final int i, String s) = (0, ''); i < 3; i = i + 1) i, // Error
 //               ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:28:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:30:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (int i, final String s) = (0, ''); i < 3; i = i + 1) i, // Ok
 //                      ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:34:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:36:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:37:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:39:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:39:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:41:13: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (final int i, String s) in [(1, 'a'), (2, 'b'), (3, 'c')]) {
 //             ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:40:5: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:42:5: Error: Can't assign to the final variable 'i'.
 //     i = i + 1; // Error
 //     ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:42:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:44:20: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //   for (var (int i, final String s) in [(1, 'a'), (2, 'b'), (3, 'c')]) {
 //                    ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:46:36: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:48:36: Error: Can't assign to the final variable 'i'.
 //     for (final int i in [1, 2, 3]) i = i + 1 // Error
 //                                    ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:49:38: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:51:38: Error: Can't assign to the final variable 'i'.
 //     for (final (int i) in [1, 2, 3]) i = i + 1 // Error
 //                                      ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:52:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:54:15: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (final int i, String s) in [(1, 'a'), (2, 'b'), (3, 'c')])
 //               ^^^^^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:53:7: Error: Can't assign to the final variable 'i'.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:55:7: Error: Can't assign to the final variable 'i'.
 //       i = i + 1 // Error
 //       ^
 //
-// pkg/front_end/testcases/patterns/for_final_variable.dart:56:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
+// pkg/front_end/testcases/patterns/for_final_variable.dart:58:22: Error: Variable patterns in declaration context can't specify 'var' or 'final' keyword.
 // Try removing the keyword.
 //     for (var (int i, final String s) in [(1, 'a'), (2, 'b'), (3, 'c')])
 //                      ^^^^^
@@ -86,7 +86,7 @@ import self as self;
 import "dart:core" as core;
 
 static method testFor() → dynamic {
-  for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:6:32: Error: Can't assign to the final variable 'i'.
+  for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:7:32: Error: Can't assign to the final variable 'i'.
   for (final int i = 0; i < 3; i = i + 1) {
                                ^") {
     core::print(i);
@@ -99,7 +99,7 @@ static method testFor() → dynamic {
         throw new core::StateError::•("Pattern matching error");
     }
     final core::int #t2 = i;
-    for (final core::int i = #t2; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:9:34: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = #t2; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:11:34: Error: Can't assign to the final variable 'i'.
   for (final (int i) = 0; i < 3; i = i + 1) {
                                  ^") {
       core::print(i);
@@ -143,7 +143,7 @@ static method testFor() → dynamic {
   }
   core::List<core::int> l1 = block {
     final core::List<core::int> #t19 = core::_GrowableList::•<core::int>(0);
-    for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:19:34: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = 0; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:21:34: Error: Can't assign to the final variable 'i'.
     for (final int i = 0; i < 3; i = i + 1) i, // Error
                                  ^")
       #t19.{core::List::add}{Invariant}(i){(core::int) → void};
@@ -157,7 +157,7 @@ static method testFor() → dynamic {
         throw new core::StateError::•("Pattern matching error");
     }
     final core::int #t22 = i;
-    for (final core::int i = #t22; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:22:36: Error: Can't assign to the final variable 'i'.
+    for (final core::int i = #t22; i.{core::num::<}(3){(core::num) → core::bool}; invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:24:36: Error: Can't assign to the final variable 'i'.
     for (final (int i) = 0; i < 3; i = i + 1) i, // Error
                                    ^")
       #t20.{core::List::add}{Invariant}(i){(core::int) → void};
@@ -205,7 +205,7 @@ static method testForIn() → dynamic {
     for (; :sync-for-iterator.{core::Iterator::moveNext}(){() → core::bool}; ) {
       final core::int i = :sync-for-iterator.{core::Iterator::current}{core::int};
       {
-        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:34:5: Error: Can't assign to the final variable 'i'.
+        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:36:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
       }
@@ -222,7 +222,7 @@ static method testForIn() → dynamic {
           if(!(#0#0 is core::int && (let final core::int #t42 = i = #0#0 in true)))
             throw new core::StateError::•("Pattern matching error");
         }
-        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:37:5: Error: Can't assign to the final variable 'i'.
+        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:39:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
       }
@@ -244,7 +244,7 @@ static method testForIn() → dynamic {
           if(!((#1#1#isSet ?{core::int} #1#1{core::int} : let final core::bool* #t44 = #1#1#isSet = true in #1#1 = #1#0.$1{core::int}) is core::int && (let final core::int #t45 = i = #1#1#isSet ?{core::int} #1#1{core::int} : let final core::bool* #t46 = #1#1#isSet = true in #1#1 = #1#0.$1{core::int} in true) && ((#1#2#isSet ?{core::String} #1#2{core::String} : let final core::bool* #t47 = #1#2#isSet = true in #1#2 = #1#0.$2{core::String}) is core::String && (let final core::String #t48 = s = #1#2#isSet ?{core::String} #1#2{core::String} : let final core::bool* #t49 = #1#2#isSet = true in #1#2 = #1#0.$2{core::String} in true))))
             throw new core::StateError::•("Pattern matching error");
         }
-        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:40:5: Error: Can't assign to the final variable 'i'.
+        invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:42:5: Error: Can't assign to the final variable 'i'.
     i = i + 1; // Error
     ^";
       }
@@ -276,7 +276,7 @@ static method testForIn() → dynamic {
       synthesized core::Iterator<core::int> :sync-for-iterator = core::_GrowableList::_literal3<core::int>(1, 2, 3).{core::Iterable::iterator}{core::Iterator<core::int>};
       for (; :sync-for-iterator.{core::Iterator::moveNext}(){() → core::bool}; ) {
         final core::int i = :sync-for-iterator.{core::Iterator::current}{core::int};
-        #t57.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:46:36: Error: Can't assign to the final variable 'i'.
+        #t57.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:48:36: Error: Can't assign to the final variable 'i'.
     for (final int i in [1, 2, 3]) i = i + 1 // Error
                                    ^"){(dynamic) → void};
       }
@@ -295,7 +295,7 @@ static method testForIn() → dynamic {
             if(!(#3#0 is core::int && (let final core::int #t60 = i = #3#0 in true)))
               throw new core::StateError::•("Pattern matching error");
           }
-          #t58.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:49:38: Error: Can't assign to the final variable 'i'.
+          #t58.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:51:38: Error: Can't assign to the final variable 'i'.
     for (final (int i) in [1, 2, 3]) i = i + 1 // Error
                                      ^"){(dynamic) → void};
         }
@@ -320,7 +320,7 @@ static method testForIn() → dynamic {
             if(!((#4#1#isSet ?{core::int} #4#1{core::int} : let final core::bool* #t63 = #4#1#isSet = true in #4#1 = #4#0.$1{core::int}) is core::int && (let final core::int #t64 = i = #4#1#isSet ?{core::int} #4#1{core::int} : let final core::bool* #t65 = #4#1#isSet = true in #4#1 = #4#0.$1{core::int} in true) && ((#4#2#isSet ?{core::String} #4#2{core::String} : let final core::bool* #t66 = #4#2#isSet = true in #4#2 = #4#0.$2{core::String}) is core::String && (let final core::String #t67 = s = #4#2#isSet ?{core::String} #4#2{core::String} : let final core::bool* #t68 = #4#2#isSet = true in #4#2 = #4#0.$2{core::String} in true))))
               throw new core::StateError::•("Pattern matching error");
           }
-          #t61.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:53:7: Error: Can't assign to the final variable 'i'.
+          #t61.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/patterns/for_final_variable.dart:55:7: Error: Can't assign to the final variable 'i'.
       i = i + 1 // Error
       ^"){(dynamic) → void};
         }
@@ -354,20 +354,20 @@ static method testForIn() → dynamic {
 
 
 Extra constant evaluation status:
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:12:38 -> RecordConstant(const (0, ""))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:15:38 -> RecordConstant(const (0, ""))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:25:40 -> RecordConstant(const (0, ""))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:28:40 -> RecordConstant(const (0, ""))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:39:40 -> RecordConstant(const (1, "a"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:39:50 -> RecordConstant(const (2, "b"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:39:60 -> RecordConstant(const (3, "c"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:42:40 -> RecordConstant(const (1, "a"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:42:50 -> RecordConstant(const (2, "b"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:42:60 -> RecordConstant(const (3, "c"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:52:42 -> RecordConstant(const (1, "a"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:52:52 -> RecordConstant(const (2, "b"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:52:62 -> RecordConstant(const (3, "c"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:56:42 -> RecordConstant(const (1, "a"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:56:52 -> RecordConstant(const (2, "b"))
-Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:56:62 -> RecordConstant(const (3, "c"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:14:38 -> RecordConstant(const (0, ""))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:17:38 -> RecordConstant(const (0, ""))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:27:40 -> RecordConstant(const (0, ""))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:30:40 -> RecordConstant(const (0, ""))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:41:40 -> RecordConstant(const (1, "a"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:41:50 -> RecordConstant(const (2, "b"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:41:60 -> RecordConstant(const (3, "c"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:44:40 -> RecordConstant(const (1, "a"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:44:50 -> RecordConstant(const (2, "b"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:44:60 -> RecordConstant(const (3, "c"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:54:42 -> RecordConstant(const (1, "a"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:54:52 -> RecordConstant(const (2, "b"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:54:62 -> RecordConstant(const (3, "c"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:58:42 -> RecordConstant(const (1, "a"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:58:52 -> RecordConstant(const (2, "b"))
+Evaluated: RecordLiteral @ org-dartlang-testcase:///for_final_variable.dart:58:62 -> RecordConstant(const (3, "c"))
 Extra constant evaluation: evaluated: 564, effectively constant: 16
diff --git a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart
index b80f1d74904..c9dcfa2eb18 100644
--- a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart
+++ b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart
@@ -4,11 +4,13 @@
 
 test(dynamic x) {
   switch (x) {
-    case int y when y == 0: // Error
+    case int y when y == 0:
     case [var y] when y == 0:
+      // Error
       return y;
-    case int y when y == 0: // Error
+    case int y when y == 0:
     case [final int y] when y == 0:
+      // Error
       return y;
     case int y || [var y] when y == 0: // Error.
       return y;
diff --git a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.strong.expect b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.strong.expect
index a1e7f85fd35..443b0885c8f 100644
--- a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.strong.expect
+++ b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.strong.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:12:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:14:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //       return y;
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:13:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:15:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //     case int y || [var y] when y == 0: // Error.
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:15:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:17:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //     case int y || [final int y] when y == 0: // Error.
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:9:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:10:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //       return y;
 //              ^
 //
@@ -35,7 +35,7 @@ static method test(dynamic x) → dynamic {
       lowered hoisted core::int y#case#0;
       lowered hoisted dynamic y#case#1;
       if(#0#0 is core::int && (let final dynamic #t3 = y#case#0 = #0#0{core::int} in true) && y#case#0 =={core::num::==}{(core::Object) → core::bool} 0 && (let final dynamic #t4 = #t1 = y#case#0 in true) || #0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t5 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && (let final dynamic #t6 = y#case#1 = #0#6#isSet ?{dynamic} #0#6{dynamic} : let final dynamic #t7 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic} in true) && y#case#1 =={core::Object::==}{(core::Object) → core::bool} 0 && (let final dynamic #t8 = #t1 = y#case#1 in true)) {
-        core::int y = invalid-expression "pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:9:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+        core::int y = invalid-expression "pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:10:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
       return y;
              ^";
         {
diff --git a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.strong.transformed.expect b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.strong.transformed.expect
index a2ffb023578..e6d8fc633b7 100644
--- a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.strong.transformed.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:12:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:14:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //       return y;
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:13:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:15:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //     case int y || [var y] when y == 0: // Error.
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:15:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:17:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //     case int y || [final int y] when y == 0: // Error.
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:9:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:10:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //       return y;
 //              ^
 //
@@ -35,7 +35,7 @@ static method test(dynamic x) → dynamic {
       lowered hoisted core::int y#case#0;
       lowered hoisted dynamic y#case#1;
       if(#0#0 is core::int && (let final core::int #t3 = y#case#0 = #0#0{core::int} in true) && y#case#0 =={core::num::==}{(core::Object) → core::bool} 0 && (let final core::int #t4 = #t1 = y#case#0 in true) || #0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final core::bool* #t5 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && (let final dynamic #t6 = y#case#1 = #0#6#isSet ?{dynamic} #0#6{dynamic} : let final core::bool* #t7 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic} in true) && y#case#1 =={core::Object::==}{(core::Object) → core::bool} 0 && (let final dynamic #t8 = #t1 = y#case#1 in true)) {
-        core::int y = invalid-expression "pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:9:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+        core::int y = invalid-expression "pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:10:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
       return y;
              ^";
         {
diff --git a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.expect b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.expect
index a1e7f85fd35..443b0885c8f 100644
--- a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.expect
+++ b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:12:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:14:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //       return y;
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:13:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:15:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //     case int y || [var y] when y == 0: // Error.
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:15:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:17:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //     case int y || [final int y] when y == 0: // Error.
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:9:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:10:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //       return y;
 //              ^
 //
@@ -35,7 +35,7 @@ static method test(dynamic x) → dynamic {
       lowered hoisted core::int y#case#0;
       lowered hoisted dynamic y#case#1;
       if(#0#0 is core::int && (let final dynamic #t3 = y#case#0 = #0#0{core::int} in true) && y#case#0 =={core::num::==}{(core::Object) → core::bool} 0 && (let final dynamic #t4 = #t1 = y#case#0 in true) || #0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t5 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && (let final dynamic #t6 = y#case#1 = #0#6#isSet ?{dynamic} #0#6{dynamic} : let final dynamic #t7 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic} in true) && y#case#1 =={core::Object::==}{(core::Object) → core::bool} 0 && (let final dynamic #t8 = #t1 = y#case#1 in true)) {
-        core::int y = invalid-expression "pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:9:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+        core::int y = invalid-expression "pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:10:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
       return y;
              ^";
         {
diff --git a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.modular.expect b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.modular.expect
index a1e7f85fd35..443b0885c8f 100644
--- a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.modular.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:12:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:14:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //       return y;
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:13:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:15:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //     case int y || [var y] when y == 0: // Error.
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:15:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:17:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //     case int y || [final int y] when y == 0: // Error.
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:9:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:10:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //       return y;
 //              ^
 //
@@ -35,7 +35,7 @@ static method test(dynamic x) → dynamic {
       lowered hoisted core::int y#case#0;
       lowered hoisted dynamic y#case#1;
       if(#0#0 is core::int && (let final dynamic #t3 = y#case#0 = #0#0{core::int} in true) && y#case#0 =={core::num::==}{(core::Object) → core::bool} 0 && (let final dynamic #t4 = #t1 = y#case#0 in true) || #0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t5 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && (let final dynamic #t6 = y#case#1 = #0#6#isSet ?{dynamic} #0#6{dynamic} : let final dynamic #t7 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic} in true) && y#case#1 =={core::Object::==}{(core::Object) → core::bool} 0 && (let final dynamic #t8 = #t1 = y#case#1 in true)) {
-        core::int y = invalid-expression "pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:9:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+        core::int y = invalid-expression "pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:10:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
       return y;
              ^";
         {
diff --git a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.transformed.expect b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.transformed.expect
index a2ffb023578..e6d8fc633b7 100644
--- a/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart.weak.transformed.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:12:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:14:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //       return y;
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:13:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:15:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //     case int y || [var y] when y == 0: // Error.
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:15:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:17:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //     case int y || [final int y] when y == 0: // Error.
 //              ^
 //
-// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:9:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:10:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
 //       return y;
 //              ^
 //
@@ -35,7 +35,7 @@ static method test(dynamic x) → dynamic {
       lowered hoisted core::int y#case#0;
       lowered hoisted dynamic y#case#1;
       if(#0#0 is core::int && (let final core::int #t3 = y#case#0 = #0#0{core::int} in true) && y#case#0 =={core::num::==}{(core::Object) → core::bool} 0 && (let final core::int #t4 = #t1 = y#case#0 in true) || #0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final core::bool* #t5 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && (let final dynamic #t6 = y#case#1 = #0#6#isSet ?{dynamic} #0#6{dynamic} : let final core::bool* #t7 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic} in true) && y#case#1 =={core::Object::==}{(core::Object) → core::bool} 0 && (let final dynamic #t8 = #t1 = y#case#1 in true)) {
-        core::int y = invalid-expression "pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:9:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
+        core::int y = invalid-expression "pkg/front_end/testcases/patterns/mismatching_joint_pattern_variables.dart:10:14: Error: Variable pattern 'y' doesn't have the same type or finality in all cases.
       return y;
              ^";
         {
diff --git a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart
index a45b35575ba..ee9ae444bd3 100644
--- a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart
+++ b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart
@@ -4,8 +4,9 @@
 
 test(dynamic x) {
   switch (x) {
-    case [int a, _] when a.isEven: // Error: type of 'a' mismatch.
+    case [int a, _] when a.isEven:
     case [_, double a] when a.ceil().isOdd:
+      // Error: type of 'a' mismatch.
       return a;
     default:
       return null;
diff --git a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.strong.expect b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.strong.expect
index 4636c8cc605..d264462a042 100644
--- a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.strong.expect
+++ b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:9:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:10:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
 //       return a;
 //              ^
 //
@@ -24,7 +24,7 @@ static method test(dynamic x) → dynamic {
       lowered hoisted core::int a#case#0;
       lowered hoisted core::double a#case#1;
       if(#0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t2 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && ((#0#6#isSet ?{dynamic} #0#6{dynamic} : let final dynamic #t3 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic}) is core::int && (let final dynamic #t4 = a#case#0 = (#0#6#isSet ?{dynamic} #0#6{dynamic} : let final dynamic #t5 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic}) as{Unchecked} core::int in true)) && a#case#0.{core::int::isEven}{core::bool} && (let final dynamic #t6 = #t1 = a#case#0 in true) || #0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t7 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && ((#0#7#isSet ?{dynamic} #0#7{dynamic} : let final dynamic #t8 = #0#7#isSet = true in #0#7 = #0#0{core::List<dynamic>}.{core::List::[]}(1){(core::int) → dynamic}) is core::double && (let final dynamic #t9 = a#case#1 = (#0#7#isSet ?{dynamic} #0#7{dynamic} : let final dynamic #t10 = #0#7#isSet = true in #0#7 = #0#0{core::List<dynamic>}.{core::List::[]}(1){(core::int) → dynamic}) as{Unchecked} core::double in true)) && a#case#1.{core::double::ceil}(){() → core::int}.{core::int::isOdd}{core::bool} && (let final dynamic #t11 = #t1 = a#case#1 in true)) {
-        core::int a = invalid-expression "pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:9:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
+        core::int a = invalid-expression "pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:10:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
       return a;
              ^";
         {
diff --git a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.strong.transformed.expect b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.strong.transformed.expect
index 39ea5952373..584ff6145b8 100644
--- a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:9:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:10:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
 //       return a;
 //              ^
 //
@@ -24,7 +24,7 @@ static method test(dynamic x) → dynamic {
       lowered hoisted core::int a#case#0;
       lowered hoisted core::double a#case#1;
       if(#0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final core::bool* #t2 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && ((#0#6#isSet ?{dynamic} #0#6{dynamic} : let final core::bool* #t3 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic}) is core::int && (let final core::int #t4 = a#case#0 = (#0#6#isSet ?{dynamic} #0#6{dynamic} : let final core::bool* #t5 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic}) as{Unchecked} core::int in true)) && a#case#0.{core::int::isEven}{core::bool} && (let final core::int #t6 = #t1 = a#case#0 in true) || #0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final core::bool* #t7 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && ((#0#7#isSet ?{dynamic} #0#7{dynamic} : let final core::bool* #t8 = #0#7#isSet = true in #0#7 = #0#0{core::List<dynamic>}.{core::List::[]}(1){(core::int) → dynamic}) is core::double && (let final core::double #t9 = a#case#1 = (#0#7#isSet ?{dynamic} #0#7{dynamic} : let final core::bool* #t10 = #0#7#isSet = true in #0#7 = #0#0{core::List<dynamic>}.{core::List::[]}(1){(core::int) → dynamic}) as{Unchecked} core::double in true)) && a#case#1.{core::double::ceil}(){() → core::int}.{core::int::isOdd}{core::bool} && (let final core::double #t11 = #t1 = a#case#1 in true)) {
-        core::int a = invalid-expression "pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:9:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
+        core::int a = invalid-expression "pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:10:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
       return a;
              ^";
         {
diff --git a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.expect b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.expect
index 4636c8cc605..d264462a042 100644
--- a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.expect
+++ b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:9:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:10:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
 //       return a;
 //              ^
 //
@@ -24,7 +24,7 @@ static method test(dynamic x) → dynamic {
       lowered hoisted core::int a#case#0;
       lowered hoisted core::double a#case#1;
       if(#0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t2 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && ((#0#6#isSet ?{dynamic} #0#6{dynamic} : let final dynamic #t3 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic}) is core::int && (let final dynamic #t4 = a#case#0 = (#0#6#isSet ?{dynamic} #0#6{dynamic} : let final dynamic #t5 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic}) as{Unchecked} core::int in true)) && a#case#0.{core::int::isEven}{core::bool} && (let final dynamic #t6 = #t1 = a#case#0 in true) || #0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t7 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && ((#0#7#isSet ?{dynamic} #0#7{dynamic} : let final dynamic #t8 = #0#7#isSet = true in #0#7 = #0#0{core::List<dynamic>}.{core::List::[]}(1){(core::int) → dynamic}) is core::double && (let final dynamic #t9 = a#case#1 = (#0#7#isSet ?{dynamic} #0#7{dynamic} : let final dynamic #t10 = #0#7#isSet = true in #0#7 = #0#0{core::List<dynamic>}.{core::List::[]}(1){(core::int) → dynamic}) as{Unchecked} core::double in true)) && a#case#1.{core::double::ceil}(){() → core::int}.{core::int::isOdd}{core::bool} && (let final dynamic #t11 = #t1 = a#case#1 in true)) {
-        core::int a = invalid-expression "pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:9:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
+        core::int a = invalid-expression "pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:10:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
       return a;
              ^";
         {
diff --git a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.modular.expect b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.modular.expect
index 4636c8cc605..d264462a042 100644
--- a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:9:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:10:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
 //       return a;
 //              ^
 //
@@ -24,7 +24,7 @@ static method test(dynamic x) → dynamic {
       lowered hoisted core::int a#case#0;
       lowered hoisted core::double a#case#1;
       if(#0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t2 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && ((#0#6#isSet ?{dynamic} #0#6{dynamic} : let final dynamic #t3 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic}) is core::int && (let final dynamic #t4 = a#case#0 = (#0#6#isSet ?{dynamic} #0#6{dynamic} : let final dynamic #t5 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic}) as{Unchecked} core::int in true)) && a#case#0.{core::int::isEven}{core::bool} && (let final dynamic #t6 = #t1 = a#case#0 in true) || #0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t7 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && ((#0#7#isSet ?{dynamic} #0#7{dynamic} : let final dynamic #t8 = #0#7#isSet = true in #0#7 = #0#0{core::List<dynamic>}.{core::List::[]}(1){(core::int) → dynamic}) is core::double && (let final dynamic #t9 = a#case#1 = (#0#7#isSet ?{dynamic} #0#7{dynamic} : let final dynamic #t10 = #0#7#isSet = true in #0#7 = #0#0{core::List<dynamic>}.{core::List::[]}(1){(core::int) → dynamic}) as{Unchecked} core::double in true)) && a#case#1.{core::double::ceil}(){() → core::int}.{core::int::isOdd}{core::bool} && (let final dynamic #t11 = #t1 = a#case#1 in true)) {
-        core::int a = invalid-expression "pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:9:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
+        core::int a = invalid-expression "pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:10:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
       return a;
              ^";
         {
diff --git a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.transformed.expect b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.transformed.expect
index 39ea5952373..584ff6145b8 100644
--- a/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart.weak.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:9:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
+// pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:10:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
 //       return a;
 //              ^
 //
@@ -24,7 +24,7 @@ static method test(dynamic x) → dynamic {
       lowered hoisted core::int a#case#0;
       lowered hoisted core::double a#case#1;
       if(#0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final core::bool* #t2 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && ((#0#6#isSet ?{dynamic} #0#6{dynamic} : let final core::bool* #t3 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic}) is core::int && (let final core::int #t4 = a#case#0 = (#0#6#isSet ?{dynamic} #0#6{dynamic} : let final core::bool* #t5 = #0#6#isSet = true in #0#6 = #0#0{core::List<dynamic>}.{core::List::[]}(0){(core::int) → dynamic}) as{Unchecked} core::int in true)) && a#case#0.{core::int::isEven}{core::bool} && (let final core::int #t6 = #t1 = a#case#0 in true) || #0#0 is core::List<dynamic> && (#0#4#isSet ?{core::bool} #0#4{core::bool} : let final core::bool* #t7 = #0#4#isSet = true in #0#4 = #0#0{core::List<dynamic>}.{core::List::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C1) && ((#0#7#isSet ?{dynamic} #0#7{dynamic} : let final core::bool* #t8 = #0#7#isSet = true in #0#7 = #0#0{core::List<dynamic>}.{core::List::[]}(1){(core::int) → dynamic}) is core::double && (let final core::double #t9 = a#case#1 = (#0#7#isSet ?{dynamic} #0#7{dynamic} : let final core::bool* #t10 = #0#7#isSet = true in #0#7 = #0#0{core::List<dynamic>}.{core::List::[]}(1){(core::int) → dynamic}) as{Unchecked} core::double in true)) && a#case#1.{core::double::ceil}(){() → core::int}.{core::int::isOdd}{core::bool} && (let final core::double #t11 = #t1 = a#case#1 in true)) {
-        core::int a = invalid-expression "pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:9:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
+        core::int a = invalid-expression "pkg/front_end/testcases/patterns/simple_switch_with_guards_error.dart:10:14: Error: Variable pattern 'a' doesn't have the same type or finality in all cases.
       return a;
              ^";
         {
diff --git a/pkg/front_end/testcases/regress/issue_29983.dart b/pkg/front_end/testcases/regress/issue_29983.dart
index a2ffd950d89..f3ca9911973 100644
--- a/pkg/front_end/testcases/regress/issue_29983.dart
+++ b/pkg/front_end/testcases/regress/issue_29983.dart
@@ -3,15 +3,15 @@
 // BSD-style license that can be found in the LICENSE file.
 
 f() sync* {
-  // Returning value from generator: forbidden.
+  // Error: Returning value from generator: forbidden.
   return missing;
 }
 
-// Arrow generator: forbidden.
+// Error: Arrow generator: forbidden.
 g() sync* => dummy;
 
 h() sync* {
-  // Local function returning value within generator: permitted.
+  // OK: Local function returning value within generator: permitted.
   (() => "return")();
 }