diff --git a/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart b/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart
index feb40dfdc89..0c2ef265ab3 100644
--- a/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart
+++ b/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart
@@ -1067,7 +1067,7 @@ void runAgnosticSharedTestsShard1(
           expression: 'notInScope',
           expectedError:
               "Error: The getter 'notInScope' isn't defined for the"
-              " class 'C'.",
+              " type 'C'.",
         );
       });
 
@@ -1077,7 +1077,7 @@ void runAgnosticSharedTestsShard1(
           expression: 'innerNotInScope',
           expectedError:
               "Error: The getter 'innerNotInScope' isn't defined for the"
-              " class 'C'.",
+              " type 'C'.",
         );
       });
     });
@@ -1183,7 +1183,7 @@ void runAgnosticSharedTestsShard1(
         await driver.checkInFrame(
           breakpointId: 'methodBP',
           expression: 'typo',
-          expectedError: "The getter 'typo' isn't defined for the class 'C'",
+          expectedError: "The getter 'typo' isn't defined for the type 'C'",
         );
       });
 
@@ -1510,7 +1510,7 @@ void runAgnosticSharedTestsShard2(
         await driver.checkInFrame(
           breakpointId: 'constructorBP',
           expression: 'typo',
-          expectedError: "The getter 'typo' isn't defined for the class 'C'",
+          expectedError: "The getter 'typo' isn't defined for the type 'C'",
         );
       });
 
@@ -1645,7 +1645,7 @@ void runAgnosticSharedTestsShard2(
         await driver.checkInFrame(
           breakpointId: 'asyncTestBP1',
           expression: 'typo',
-          expectedError: "The getter 'typo' isn't defined for the class 'D'",
+          expectedError: "The getter 'typo' isn't defined for the type 'D'",
         );
       });
 
diff --git a/pkg/front_end/lib/src/codes/cfe_codes_generated.dart b/pkg/front_end/lib/src/codes/cfe_codes_generated.dart
index 92da17deb98..fe188fb2891 100644
--- a/pkg/front_end/lib/src/codes/cfe_codes_generated.dart
+++ b/pkg/front_end/lib/src/codes/cfe_codes_generated.dart
@@ -4801,7 +4801,7 @@ const Template<Message Function(String name, DartType _type)>
     const Template<Message Function(String name, DartType _type)>(
   "UndefinedGetter",
   problemMessageTemplate:
-      r"""The getter '#name' isn't defined for the class '#type'.""",
+      r"""The getter '#name' isn't defined for the type '#type'.""",
   correctionMessageTemplate:
       r"""Try correcting the name to the name of an existing getter, or defining a getter or field named '#name'.""",
   withArguments: _withArgumentsUndefinedGetter,
@@ -4824,7 +4824,7 @@ Message _withArgumentsUndefinedGetter(String name, DartType _type) {
   return new Message(
     codeUndefinedGetter,
     problemMessage:
-        """The getter '${name}' isn't defined for the class '${type}'.""" +
+        """The getter '${name}' isn't defined for the type '${type}'.""" +
             labeler.originMessages,
     correctionMessage:
         """Try correcting the name to the name of an existing getter, or defining a getter or field named '${name}'.""",
@@ -4841,7 +4841,7 @@ const Template<Message Function(String name, DartType _type)>
     const Template<Message Function(String name, DartType _type)>(
   "UndefinedMethod",
   problemMessageTemplate:
-      r"""The method '#name' isn't defined for the class '#type'.""",
+      r"""The method '#name' isn't defined for the type '#type'.""",
   correctionMessageTemplate:
       r"""Try correcting the name to the name of an existing method, or defining a method named '#name'.""",
   withArguments: _withArgumentsUndefinedMethod,
@@ -4864,7 +4864,7 @@ Message _withArgumentsUndefinedMethod(String name, DartType _type) {
   return new Message(
     codeUndefinedMethod,
     problemMessage:
-        """The method '${name}' isn't defined for the class '${type}'.""" +
+        """The method '${name}' isn't defined for the type '${type}'.""" +
             labeler.originMessages,
     correctionMessage:
         """Try correcting the name to the name of an existing method, or defining a method named '${name}'.""",
@@ -4881,7 +4881,7 @@ const Template<Message Function(String name, DartType _type)>
     const Template<Message Function(String name, DartType _type)>(
   "UndefinedOperator",
   problemMessageTemplate:
-      r"""The operator '#name' isn't defined for the class '#type'.""",
+      r"""The operator '#name' isn't defined for the type '#type'.""",
   correctionMessageTemplate:
       r"""Try correcting the operator to an existing operator, or defining a '#name' operator.""",
   withArguments: _withArgumentsUndefinedOperator,
@@ -4905,7 +4905,7 @@ Message _withArgumentsUndefinedOperator(String name, DartType _type) {
   return new Message(
     codeUndefinedOperator,
     problemMessage:
-        """The operator '${name}' isn't defined for the class '${type}'.""" +
+        """The operator '${name}' isn't defined for the type '${type}'.""" +
             labeler.originMessages,
     correctionMessage:
         """Try correcting the operator to an existing operator, or defining a '${name}' operator.""",
@@ -4922,7 +4922,7 @@ const Template<Message Function(String name, DartType _type)>
     const Template<Message Function(String name, DartType _type)>(
   "UndefinedSetter",
   problemMessageTemplate:
-      r"""The setter '#name' isn't defined for the class '#type'.""",
+      r"""The setter '#name' isn't defined for the type '#type'.""",
   correctionMessageTemplate:
       r"""Try correcting the name to the name of an existing setter, or defining a setter or field named '#name'.""",
   withArguments: _withArgumentsUndefinedSetter,
@@ -4945,7 +4945,7 @@ Message _withArgumentsUndefinedSetter(String name, DartType _type) {
   return new Message(
     codeUndefinedSetter,
     problemMessage:
-        """The setter '${name}' isn't defined for the class '${type}'.""" +
+        """The setter '${name}' isn't defined for the type '${type}'.""" +
             labeler.originMessages,
     correctionMessage:
         """Try correcting the name to the name of an existing setter, or defining a setter or field named '${name}'.""",
diff --git a/pkg/front_end/messages.yaml b/pkg/front_end/messages.yaml
index 3e120b17043..848ef09560c 100644
--- a/pkg/front_end/messages.yaml
+++ b/pkg/front_end/messages.yaml
@@ -4160,7 +4160,7 @@ InvalidUseOfNullAwareAccess:
   analyzerCode: INVALID_USE_OF_NULL_AWARE_ACCESS
 
 UndefinedGetter:
-  problemMessage: "The getter '#name' isn't defined for the class '#type'."
+  problemMessage: "The getter '#name' isn't defined for the type '#type'."
   correctionMessage: "Try correcting the name to the name of an existing getter, or defining a getter or field named '#name'."
   analyzerCode: UNDEFINED_GETTER
   script: >
@@ -4170,7 +4170,7 @@ UndefinedGetter:
     }
 
 UndefinedSetter:
-  problemMessage: "The setter '#name' isn't defined for the class '#type'."
+  problemMessage: "The setter '#name' isn't defined for the type '#type'."
   correctionMessage: "Try correcting the name to the name of an existing setter, or defining a setter or field named '#name'."
   analyzerCode: UNDEFINED_SETTER
   script: >
@@ -4180,7 +4180,7 @@ UndefinedSetter:
     }
 
 UndefinedMethod:
-  problemMessage: "The method '#name' isn't defined for the class '#type'."
+  problemMessage: "The method '#name' isn't defined for the type '#type'."
   correctionMessage: "Try correcting the name to the name of an existing method, or defining a method named '#name'."
   analyzerCode: UNDEFINED_METHOD
   script: >
@@ -4190,7 +4190,7 @@ UndefinedMethod:
     }
 
 UndefinedOperator:
-  problemMessage: "The operator '#name' isn't defined for the class '#type'."
+  problemMessage: "The operator '#name' isn't defined for the type '#type'."
   correctionMessage: "Try correcting the operator to an existing operator, or defining a '#name' operator."
   analyzerCode: UNDEFINED_METHOD
   script: >
diff --git a/pkg/front_end/test/dartdoc_test_test.dart b/pkg/front_end/test/dartdoc_test_test.dart
index 5a47375057a..56ec855da0e 100644
--- a/pkg/front_end/test/dartdoc_test_test.dart
+++ b/pkg/front_end/test/dartdoc_test_test.dart
@@ -130,7 +130,7 @@ void _internal() {
           """dartdoctest:tester:3:20: Error: This expression has type 'void' and can't be used.
   dartDocTest.test(_internal() + 2, 42);
                    ^
-dartdoctest:tester:3:32: Error: The operator '+' isn't defined for the class 'void'.
+dartdoctest:tester:3:32: Error: The operator '+' isn't defined for the type 'void'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
   dartDocTest.test(_internal() + 2, 42);
                                ^""",
diff --git a/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.expect b/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.expect
index bc32b35f2c1..796a81d407a 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'invalidProperty'.
 //   return x.invalidProperty;
@@ -70,7 +70,7 @@ static const field core::int firstException = invalid-expression "Unhandled core
 static const field core::int lastException = invalid-expression "Unhandled core exception: Bad state: No element";
 static const field core::int singleException = invalid-expression "Unhandled core exception: Bad state: No element";
 static const field core::int singleExceptionMulti = invalid-expression "Unhandled core exception: Bad state: Too many elements";
-static const field core::int invalidProperty = invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the class 'List<int>'.
+static const field core::int invalidProperty = invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'invalidProperty'.
   return x.invalidProperty;
@@ -94,7 +94,7 @@ static method singleExceptionMultiFn() → core::int {
   return #C4.{core::Iterable::single}{core::int};
 }
 static method invalidPropertyFn() → core::int {
-  return invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the class 'List<int>'.
+  return invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'invalidProperty'.
   return x.invalidProperty;
diff --git a/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.modular.expect b/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.modular.expect
index bc32b35f2c1..796a81d407a 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'invalidProperty'.
 //   return x.invalidProperty;
@@ -70,7 +70,7 @@ static const field core::int firstException = invalid-expression "Unhandled core
 static const field core::int lastException = invalid-expression "Unhandled core exception: Bad state: No element";
 static const field core::int singleException = invalid-expression "Unhandled core exception: Bad state: No element";
 static const field core::int singleExceptionMulti = invalid-expression "Unhandled core exception: Bad state: Too many elements";
-static const field core::int invalidProperty = invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the class 'List<int>'.
+static const field core::int invalidProperty = invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'invalidProperty'.
   return x.invalidProperty;
@@ -94,7 +94,7 @@ static method singleExceptionMultiFn() → core::int {
   return #C4.{core::Iterable::single}{core::int};
 }
 static method invalidPropertyFn() → core::int {
-  return invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the class 'List<int>'.
+  return invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'invalidProperty'.
   return x.invalidProperty;
diff --git a/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.transformed.expect
index d3ed84a0109..7fc28c4d4f5 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_list_error.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'invalidProperty'.
 //   return x.invalidProperty;
@@ -70,7 +70,7 @@ static const field core::int firstException = invalid-expression "Unhandled core
 static const field core::int lastException = invalid-expression "Unhandled core exception: Bad state: No element";
 static const field core::int singleException = invalid-expression "Unhandled core exception: Bad state: No element";
 static const field core::int singleExceptionMulti = invalid-expression "Unhandled core exception: Bad state: Too many elements";
-static const field core::int invalidProperty = invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the class 'List<int>'.
+static const field core::int invalidProperty = invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'invalidProperty'.
   return x.invalidProperty;
@@ -94,7 +94,7 @@ static method singleExceptionMultiFn() → core::int {
   return #C4.{core::Iterable::single}{core::int};
 }
 static method invalidPropertyFn() → core::int {
-  return invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the class 'List<int>'.
+  return invalid-expression "pkg/front_end/testcases/const_functions/const_functions_list_error.dart:36:12: Error: The getter 'invalidProperty' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'invalidProperty'.
   return x.invalidProperty;
diff --git a/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.expect
index fb625a86421..5bd14450cfc 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.expect
@@ -125,13 +125,13 @@ library;
 //   Class<int><int>.named<int><int>();
 //                                    ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>();
@@ -143,73 +143,73 @@ library;
 //   Class<int>.named<int>;
 //                   ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named();
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>();
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named<int>();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>();
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>();
@@ -229,12 +229,12 @@ class Class<T extends core::Object? = dynamic> extends core::Object {
 static method test() → dynamic {
   #C1;
   new self::Class::•<core::int>();
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>;
        ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(<core::int>[]);
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>();
@@ -249,56 +249,56 @@ Try changing the operand or remove the type arguments.
   Class<int>.named<int>;
                   ^";
   new self::Class::named<core::int>();
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named;
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named;
                   ^^^^^" in <core::int>[]{<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named();
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named();
                   ^^^^^" in <core::int>[]{<unresolved>}.named());
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>;
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int>;
                   ^^^^^" in <core::int>[]{<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>();
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named<int>();
                   ^^^^^" in <core::int>[]{<unresolved>}.named<core::int>());
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>;
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>;
                   ^^^^^" in <core::int>[]{<unresolved>}.named){dynamic}.<(#C3){dynamic}.>(<core::int>[]);
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>();
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>();
diff --git a/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.modular.expect
index fb625a86421..5bd14450cfc 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.modular.expect
@@ -125,13 +125,13 @@ library;
 //   Class<int><int>.named<int><int>();
 //                                    ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>();
@@ -143,73 +143,73 @@ library;
 //   Class<int>.named<int>;
 //                   ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named();
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>();
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named<int>();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>();
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>();
@@ -229,12 +229,12 @@ class Class<T extends core::Object? = dynamic> extends core::Object {
 static method test() → dynamic {
   #C1;
   new self::Class::•<core::int>();
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>;
        ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(<core::int>[]);
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>();
@@ -249,56 +249,56 @@ Try changing the operand or remove the type arguments.
   Class<int>.named<int>;
                   ^";
   new self::Class::named<core::int>();
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named;
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named;
                   ^^^^^" in <core::int>[]{<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named();
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named();
                   ^^^^^" in <core::int>[]{<unresolved>}.named());
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>;
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int>;
                   ^^^^^" in <core::int>[]{<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>();
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named<int>();
                   ^^^^^" in <core::int>[]{<unresolved>}.named<core::int>());
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>;
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>;
                   ^^^^^" in <core::int>[]{<unresolved>}.named){dynamic}.<(#C3){dynamic}.>(<core::int>[]);
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>();
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>();
diff --git a/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.transformed.expect
index 0054772403b..2fc95f3bcaa 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart.strong.transformed.expect
@@ -125,13 +125,13 @@ library;
 //   Class<int><int>.named<int><int>();
 //                                    ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>();
@@ -143,73 +143,73 @@ library;
 //   Class<int>.named<int>;
 //                   ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named();
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>();
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named<int>();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>();
 //        ^
 //
-// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>();
@@ -229,12 +229,12 @@ class Class<T extends core::Object? = dynamic> extends core::Object {
 static method test() → dynamic {
   #C1;
   new self::Class::•<core::int>();
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:13:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>;
        ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(core::_GrowableList::•<core::int>(0));
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:14:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>();
@@ -249,56 +249,56 @@ Try changing the operand or remove the type arguments.
   Class<int>.named<int>;
                   ^";
   new self::Class::named<core::int>();
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named;
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:19:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named;
                   ^^^^^" in core::_GrowableList::•<core::int>(0){<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named();
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:20:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named();
                   ^^^^^" in core::_GrowableList::•<core::int>(0){<unresolved>}.named());
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>;
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int>;
                   ^^^^^" in core::_GrowableList::•<core::int>(0){<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>();
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named<int>();
                   ^^^^^" in core::_GrowableList::•<core::int>(0){<unresolved>}.named<core::int>());
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>;
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>;
                   ^^^^^" in core::_GrowableList::•<core::int>(0){<unresolved>}.named){dynamic}.<(#C3){dynamic}.>(core::_GrowableList::•<core::int>(0));
-  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>();
-       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C2{<unresolved>}.<(#C3){dynamic}.>(invalid-expression "pkg/front_end/testcases/constructor_tearoffs/duplicate_instantiation.dart:24:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>();
diff --git a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.expect b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.expect
index 8c232770c1f..096af813738 100644
--- a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.expect
+++ b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
 //   request.response; // error
 //           ^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error
@@ -49,7 +49,7 @@ class HttpRequest extends core::Object {
     return new self::HttpRequest::•();
 }
 static method testA(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -59,7 +59,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{_in::Interceptor::hashCode}{core::int};
 }
 static method testB(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -69,17 +69,17 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{_in::Interceptor::hashCode}{core::int};
 }
 static method testC(self::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error
           ^^^^^^^^^^^" in request{<unresolved>}.certificate;
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
   request.response; // error
           ^^^^^^^^" in request{<unresolved>}.response;
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error
diff --git a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.modular.expect b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.modular.expect
index 8c232770c1f..096af813738 100644
--- a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.modular.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
 //   request.response; // error
 //           ^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error
@@ -49,7 +49,7 @@ class HttpRequest extends core::Object {
     return new self::HttpRequest::•();
 }
 static method testA(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -59,7 +59,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{_in::Interceptor::hashCode}{core::int};
 }
 static method testB(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -69,17 +69,17 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{_in::Interceptor::hashCode}{core::int};
 }
 static method testC(self::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error
           ^^^^^^^^^^^" in request{<unresolved>}.certificate;
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
   request.response; // error
           ^^^^^^^^" in request{<unresolved>}.response;
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error
diff --git a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.transformed.expect b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.transformed.expect
index 76e6c05a744..4cd129c408a 100644
--- a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.transformed.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
 //   request.response; // error
 //           ^^^^^^^^
 //
-// pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error
@@ -49,7 +49,7 @@ class HttpRequest extends core::Object {
     return new self::HttpRequest::•();
 }
 static method testA(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -59,7 +59,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{_in::Interceptor::hashCode}{core::int};
 }
 static method testB(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -69,17 +69,17 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{_in::Interceptor::hashCode}{core::int};
 }
 static method testC(self::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error
           ^^^^^^^^^^^" in request{<unresolved>}.certificate;
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
   request.response; // error
           ^^^^^^^^" in request{<unresolved>}.response;
-  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dart2js/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dart2js/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error
diff --git a/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.expect b/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.expect
index 073ec2ef94e..f8c62bedba0 100644
--- a/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.expect
+++ b/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
 //   request.response; // error
 //           ^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error
@@ -48,7 +48,7 @@ class HttpRequest extends core::Object {
     return new self::HttpRequest::•();
 }
 static method testA(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -58,7 +58,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{core::Object::hashCode}{core::int};
 }
 static method testB(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -68,17 +68,17 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{core::Object::hashCode}{core::int};
 }
 static method testC(self::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error
           ^^^^^^^^^^^" in request{<unresolved>}.certificate;
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
   request.response; // error
           ^^^^^^^^" in request{<unresolved>}.response;
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error
diff --git a/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.modular.expect b/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.modular.expect
index 073ec2ef94e..f8c62bedba0 100644
--- a/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.modular.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
 //   request.response; // error
 //           ^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error
@@ -48,7 +48,7 @@ class HttpRequest extends core::Object {
     return new self::HttpRequest::•();
 }
 static method testA(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -58,7 +58,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{core::Object::hashCode}{core::int};
 }
 static method testB(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -68,17 +68,17 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{core::Object::hashCode}{core::int};
 }
 static method testC(self::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error
           ^^^^^^^^^^^" in request{<unresolved>}.certificate;
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
   request.response; // error
           ^^^^^^^^" in request{<unresolved>}.response;
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error
diff --git a/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.transformed.expect b/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.transformed.expect
index 073ec2ef94e..f8c62bedba0 100644
--- a/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dartdevc/conditional_import.dart.strong.transformed.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:html'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error (from dart:io)
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
 //   request.response; // error
 //           ^^^^^^^^
 //
-// pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error
@@ -48,7 +48,7 @@ class HttpRequest extends core::Object {
     return new self::HttpRequest::•();
 }
 static method testA(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:20:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -58,7 +58,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{core::Object::hashCode}{core::int};
 }
 static method testB(html::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:27:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:html'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error (from dart:io)
@@ -68,17 +68,17 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{core::Object::hashCode}{core::int};
 }
 static method testC(self::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error
           ^^^^^^^^^^^" in request{<unresolved>}.certificate;
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
   request.response; // error
           ^^^^^^^^" in request{<unresolved>}.response;
-  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/dartdevc/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/dartdevc/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error
diff --git a/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.expect b/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.expect
index 06cf7ae3aec..0bcede026db 100644
--- a/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.expect
+++ b/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the class 'C'.
+// pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   C c1 = .id1();
 //          ^
 //
-// pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the class 'C'.
+// pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   C c2 = .id2();
@@ -26,12 +26,12 @@ class C extends core::Object /*hasConstConstructor*/  {
     return #C1;
 }
 static method test() → void {
-  self::C c1 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the class 'C'.
+  self::C c1 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   C c1 = .id1();
          ^" in self::C::id1{<unresolved>}.call() as{TypeError,ForDynamic} self::C;
-  self::C c2 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the class 'C'.
+  self::C c2 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   C c2 = .id2();
diff --git a/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.modular.expect b/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.modular.expect
index 06cf7ae3aec..0bcede026db 100644
--- a/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.modular.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the class 'C'.
+// pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   C c1 = .id1();
 //          ^
 //
-// pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the class 'C'.
+// pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   C c2 = .id2();
@@ -26,12 +26,12 @@ class C extends core::Object /*hasConstConstructor*/  {
     return #C1;
 }
 static method test() → void {
-  self::C c1 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the class 'C'.
+  self::C c1 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   C c1 = .id1();
          ^" in self::C::id1{<unresolved>}.call() as{TypeError,ForDynamic} self::C;
-  self::C c2 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the class 'C'.
+  self::C c2 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   C c2 = .id2();
diff --git a/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.transformed.expect b/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.transformed.expect
index 3e8fdcace64..f8c892d2bf1 100644
--- a/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dot_shorthands/call_error.dart.strong.transformed.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the class 'C'.
+// pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   C c1 = .id1();
 //          ^
 //
-// pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the class 'C'.
+// pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   C c2 = .id2();
@@ -26,12 +26,12 @@ class C extends core::Object /*hasConstConstructor*/  {
     return #C1;
 }
 static method test() → void {
-  self::C c1 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the class 'C'.
+  self::C c1 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:13:10: Error: The method 'call' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   C c1 = .id1();
          ^" in self::C::id1{<unresolved>}.call() as{TypeError,ForDynamic,Unchecked} self::C;
-  self::C c2 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the class 'C'.
+  self::C c2 = invalid-expression "pkg/front_end/testcases/dot_shorthands/call_error.dart:14:10: Error: The method 'call' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/dot_shorthands/call_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   C c2 = .id2();
diff --git a/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.expect b/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.expect
index e3afa536913..5f9a0120ee0 100644
--- a/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.expect
+++ b/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the class 'Color'.
+// pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the type 'Color'.
 //  - 'Color' is from 'pkg/front_end/testcases/dot_shorthands/static_method_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   Color c = .red();
@@ -30,7 +30,7 @@ class Color extends core::Object {
     return new self::Color::•(1);
 }
 static method test() → void {
-  self::Color c = invalid-expression "pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the class 'Color'.
+  self::Color c = invalid-expression "pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the type 'Color'.
  - 'Color' is from 'pkg/front_end/testcases/dot_shorthands/static_method_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   Color c = .red();
diff --git a/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.modular.expect b/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.modular.expect
index e3afa536913..5f9a0120ee0 100644
--- a/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the class 'Color'.
+// pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the type 'Color'.
 //  - 'Color' is from 'pkg/front_end/testcases/dot_shorthands/static_method_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   Color c = .red();
@@ -30,7 +30,7 @@ class Color extends core::Object {
     return new self::Color::•(1);
 }
 static method test() → void {
-  self::Color c = invalid-expression "pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the class 'Color'.
+  self::Color c = invalid-expression "pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the type 'Color'.
  - 'Color' is from 'pkg/front_end/testcases/dot_shorthands/static_method_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   Color c = .red();
diff --git a/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.transformed.expect b/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.transformed.expect
index 74b417c0de0..70b6cd24af3 100644
--- a/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dot_shorthands/static_method_error.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the class 'Color'.
+// pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the type 'Color'.
 //  - 'Color' is from 'pkg/front_end/testcases/dot_shorthands/static_method_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   Color c = .red();
@@ -30,7 +30,7 @@ class Color extends core::Object {
     return new self::Color::•(1);
 }
 static method test() → void {
-  self::Color c = invalid-expression "pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the class 'Color'.
+  self::Color c = invalid-expression "pkg/front_end/testcases/dot_shorthands/static_method_error.dart:12:13: Error: The method 'call' isn't defined for the type 'Color'.
  - 'Color' is from 'pkg/front_end/testcases/dot_shorthands/static_method_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   Color c = .red();
diff --git a/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.expect b/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.expect
index 702d0dc0969..bedb2ffdd9a 100644
--- a/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.expect
+++ b/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.expect
@@ -12,13 +12,13 @@ library;
 // (Object?, int) testMethod2(E e) => e.method(); // Error
 //                                      ^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod3(E e) => e.method().$1.unresolved(); // Error
 //                                   ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod4(E e) => e.method().$2.unresolved(); // Error
@@ -54,13 +54,13 @@ library;
 // (int, Object?) f3 = f; // Error
 //                     ^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod5(E e) => f.$1.unresolved(); // Error
 //                          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod6(E e) => f.$2.unresolved(); // Error
@@ -76,13 +76,13 @@ library;
 // (int, Object?) g3 = g; // Error
 //                     ^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testGetter5(E e) => g.$1.unresolved(); // Error
 //                          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testGetter6(E e) => g.$2.unresolved(); // Error
@@ -165,13 +165,13 @@ static method testMethod2(self::E /* erasure=self::C */ e) → (core::Object?, c
 (Object?, int) testMethod2(E e) => e.method(); // Error
                                      ^" in e.{self::A::method}(){() → (core::Object?, core::Object?)} as{TypeError} (core::Object?, core::int);
 static method testMethod3(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod3(E e) => e.method().\$1.unresolved(); // Error
                                   ^^^^^^^^^^" in e.{self::A::method}(){() → (core::Object?, core::Object?)}.$1{core::Object?}{<unresolved>}.unresolved();
 static method testMethod4(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod4(E e) => e.method().\$2.unresolved(); // Error
@@ -200,25 +200,25 @@ static method testSetter(self::E /* erasure=self::C */ e) → void {
                        ^" in (a as core::int, b) as{TypeError} (core::int, core::int);
 }
 static method testMethod5(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod5(E e) => f.\$1.unresolved(); // Error
                          ^^^^^^^^^^" in self::f.$1{core::Object?}{<unresolved>}.unresolved();
 static method testMethod6(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod6(E e) => f.\$2.unresolved(); // Error
                          ^^^^^^^^^^" in self::f.$2{core::Object?}{<unresolved>}.unresolved();
 static method testGetter5(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testGetter5(E e) => g.\$1.unresolved(); // Error
                          ^^^^^^^^^^" in self::g.$1{core::Object?}{<unresolved>}.unresolved();
 static method testGetter6(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testGetter6(E e) => g.\$2.unresolved(); // Error
diff --git a/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.modular.expect b/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.modular.expect
index 702d0dc0969..bedb2ffdd9a 100644
--- a/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.modular.expect
@@ -12,13 +12,13 @@ library;
 // (Object?, int) testMethod2(E e) => e.method(); // Error
 //                                      ^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod3(E e) => e.method().$1.unresolved(); // Error
 //                                   ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod4(E e) => e.method().$2.unresolved(); // Error
@@ -54,13 +54,13 @@ library;
 // (int, Object?) f3 = f; // Error
 //                     ^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod5(E e) => f.$1.unresolved(); // Error
 //                          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod6(E e) => f.$2.unresolved(); // Error
@@ -76,13 +76,13 @@ library;
 // (int, Object?) g3 = g; // Error
 //                     ^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testGetter5(E e) => g.$1.unresolved(); // Error
 //                          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testGetter6(E e) => g.$2.unresolved(); // Error
@@ -165,13 +165,13 @@ static method testMethod2(self::E /* erasure=self::C */ e) → (core::Object?, c
 (Object?, int) testMethod2(E e) => e.method(); // Error
                                      ^" in e.{self::A::method}(){() → (core::Object?, core::Object?)} as{TypeError} (core::Object?, core::int);
 static method testMethod3(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod3(E e) => e.method().\$1.unresolved(); // Error
                                   ^^^^^^^^^^" in e.{self::A::method}(){() → (core::Object?, core::Object?)}.$1{core::Object?}{<unresolved>}.unresolved();
 static method testMethod4(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod4(E e) => e.method().\$2.unresolved(); // Error
@@ -200,25 +200,25 @@ static method testSetter(self::E /* erasure=self::C */ e) → void {
                        ^" in (a as core::int, b) as{TypeError} (core::int, core::int);
 }
 static method testMethod5(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod5(E e) => f.\$1.unresolved(); // Error
                          ^^^^^^^^^^" in self::f.$1{core::Object?}{<unresolved>}.unresolved();
 static method testMethod6(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod6(E e) => f.\$2.unresolved(); // Error
                          ^^^^^^^^^^" in self::f.$2{core::Object?}{<unresolved>}.unresolved();
 static method testGetter5(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testGetter5(E e) => g.\$1.unresolved(); // Error
                          ^^^^^^^^^^" in self::g.$1{core::Object?}{<unresolved>}.unresolved();
 static method testGetter6(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testGetter6(E e) => g.\$2.unresolved(); // Error
diff --git a/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.transformed.expect b/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.transformed.expect
index ea8395e6b19..d46570d7300 100644
--- a/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/combined_member_signature.dart.strong.transformed.expect
@@ -12,13 +12,13 @@ library;
 // (Object?, int) testMethod2(E e) => e.method(); // Error
 //                                      ^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod3(E e) => e.method().$1.unresolved(); // Error
 //                                   ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod4(E e) => e.method().$2.unresolved(); // Error
@@ -54,13 +54,13 @@ library;
 // (int, Object?) f3 = f; // Error
 //                     ^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod5(E e) => f.$1.unresolved(); // Error
 //                          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testMethod6(E e) => f.$2.unresolved(); // Error
@@ -76,13 +76,13 @@ library;
 // (int, Object?) g3 = g; // Error
 //                     ^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testGetter5(E e) => g.$1.unresolved(); // Error
 //                          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 // testGetter6(E e) => g.$2.unresolved(); // Error
@@ -165,13 +165,13 @@ static method testMethod2(self::E /* erasure=self::C */ e) → (core::Object?, c
 (Object?, int) testMethod2(E e) => e.method(); // Error
                                      ^" in e.{self::A::method}(){() → (core::Object?, core::Object?)} as{TypeError} (core::Object?, core::int);
 static method testMethod3(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:28:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod3(E e) => e.method().\$1.unresolved(); // Error
                                   ^^^^^^^^^^" in e.{self::A::method}(){() → (core::Object?, core::Object?)}.$1{core::Object?}{<unresolved>}.unresolved();
 static method testMethod4(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:29:35: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod4(E e) => e.method().\$2.unresolved(); // Error
@@ -200,25 +200,25 @@ static method testSetter(self::E /* erasure=self::C */ e) → void {
                        ^" in (a as core::int, b) as{TypeError} (core::int, core::int);
 }
 static method testMethod5(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:47:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod5(E e) => f.\$1.unresolved(); // Error
                          ^^^^^^^^^^" in self::f.$1{core::Object?}{<unresolved>}.unresolved();
 static method testMethod6(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:48:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testMethod6(E e) => f.\$2.unresolved(); // Error
                          ^^^^^^^^^^" in self::f.$2{core::Object?}{<unresolved>}.unresolved();
 static method testGetter5(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:54:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testGetter5(E e) => g.\$1.unresolved(); // Error
                          ^^^^^^^^^^" in self::g.$1{core::Object?}{<unresolved>}.unresolved();
 static method testGetter6(self::E /* erasure=self::C */ e) → dynamic
-  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the class 'Object?'.
+  return invalid-expression "pkg/front_end/testcases/extension_types/combined_member_signature.dart:55:26: Error: The method 'unresolved' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 testGetter6(E e) => g.\$2.unresolved(); // Error
diff --git a/pkg/front_end/testcases/extension_types/field_access.dart.strong.expect b/pkg/front_end/testcases/extension_types/field_access.dart.strong.expect
index ebedbabd22c..c3a45b1ba06 100644
--- a/pkg/front_end/testcases/extension_types/field_access.dart.strong.expect
+++ b/pkg/front_end/testcases/extension_types/field_access.dart.strong.expect
@@ -16,12 +16,12 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = 42; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = 42; // Error, should not resolve to extension method.
 //              ^^
@@ -36,12 +36,12 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //              ^^
@@ -56,32 +56,32 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //              ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                        ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //                   ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //              ^^
@@ -96,12 +96,12 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = 42; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = 42; // Error, should not resolve to extension method.
 //              ^^
@@ -126,62 +126,62 @@ library;
 //     var b4 = b<int>; // Error
 //               ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
 //     var c1 = this.a = 42; // Error
 //                   ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
 //     var c2 = a = 42; // Error
 //              ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
 //     var c3 = this.b = '42'; // Error
 //                   ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
 //     var c4 = b = '42'; // Error
 //              ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d1 = this.a(); // Error
 //                    ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d2 = a(); // Error
 //               ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d3 = this.a.call(); // Error
 //                     ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d4 = a.call(); // Error
 //                ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e1 = this.b(); // Error
 //                    ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e2 = b(); // Error
 //               ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e3 = this.b.call(); // Error
 //                     ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e4 = b.call(); // Error
 //                ^^^^
@@ -191,7 +191,7 @@ library;
 //   var a2 = inlineClass.it<int>; // Error
 //                          ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var a3 = inlineClass.it = 42; // Error,
 //                        ^^
@@ -201,7 +201,7 @@ library;
 //   var b2 = genericInlineClass.it<int>; // Error
 //                                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<String>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<String>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var b3 = genericInlineClass.it = '42'; // Error, should not
 //                               ^^
@@ -211,12 +211,12 @@ library;
 //   var c2 = functionInlineClass.it<int>; // Error
 //                                  ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<String>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<String>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var c5 = functionInlineClass.it = () => '42'; // Error, should not
 //                                ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var d6 = genericFunctionInlineClass.it = <T>() => throw ''; // Error, should
 //                                       ^^
@@ -226,7 +226,7 @@ library;
 //   var e2 = dynamicInlineClass.it<int>; // Error
 //                                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var e4 = dynamicInlineClass.it = '42'; // Error, should not resolve
 //                               ^^
@@ -236,7 +236,7 @@ library;
 //   var f2 = erroneousInlineClass.a<int>; // Error
 //                                  ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
 //   var f3 = erroneousInlineClass.a = 42; // Error, should not resolve
 //                                 ^
@@ -246,22 +246,22 @@ library;
 //   var g2 = erroneousInlineClass.a<int>; // Error
 //                                  ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
 //   var g3 = erroneousInlineClass.b = '42'; // Error, should not resolve
 //                                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
 //   var h1 = privateInlineClass._it; // Error
 //                               ^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
 //   var h2 = privateInlineClass._it<int>; // Error
 //                               ^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
 //   var h3 = privateInlineClass._it = 42; // Error
 //                               ^^^
@@ -335,11 +335,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = 42; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = 42; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = 42;
@@ -363,11 +363,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  self::GenericInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+  self::GenericInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = t;
-  self::GenericInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+  self::GenericInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = t; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = t;
@@ -391,11 +391,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  () → self::FunctionInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+  () → self::FunctionInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = t;
-  () → self::FunctionInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+  () → self::FunctionInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = t; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = t;
@@ -419,17 +419,17 @@ static extension-type-member method GenericFunctionInlineClass|test(lowered fina
   () → core::int a4 = (#this as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int b1 = (#this as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int b2 = (#this as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
-  dynamic c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+  dynamic c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
-                  ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+                  ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
                        ^" in #this{<unresolved>}.t;
-  dynamic c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+  dynamic c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = t; // Error, should not resolve to extension method.
-             ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+             ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
     var c2 = it = t; // Error, should not resolve to extension method.
                   ^" in #this{<unresolved>}.t;
@@ -459,11 +459,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = 42; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = 42; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = 42;
@@ -501,51 +501,51 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b4 = b<int>; // Error
               ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
     var c1 = this.a = 42; // Error
                   ^" in #this.{<unresolved>}a = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
     var c2 = a = 42; // Error
              ^" in #this.{<unresolved>}a = 42;
-  core::String c3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+  core::String c3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
     var c3 = this.b = '42'; // Error
                   ^" in #this.{<unresolved>}b = "42";
-  core::String c4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+  core::String c4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
     var c4 = b = '42'; // Error
              ^" in #this.{<unresolved>}b = "42";
-  dynamic d1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d1 = this.a(); // Error
                    ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic d2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d2 = a(); // Error
               ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic d3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d3 = this.a.call(); // Error
                     ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic d4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d4 = a.call(); // Error
                ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic e1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e1 = this.b(); // Error
                    ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
-  dynamic e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e2 = b(); // Error
               ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
-  dynamic e3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e3 = this.b.call(); // Error
                     ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
-  dynamic e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e4 = b.call(); // Error
                ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
@@ -558,7 +558,7 @@ static method test(self::InlineClass% /* erasure=core::int, declared=! */ inline
 Try changing the operand or remove the type arguments.
   var a2 = inlineClass.it<int>; // Error
                          ^";
-  core::int a3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+  core::int a3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var a3 = inlineClass.it = 42; // Error,
                        ^^" in inlineClass.{<unresolved>}it = 42;
@@ -567,7 +567,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
 Try changing the operand or remove the type arguments.
   var b2 = genericInlineClass.it<int>; // Error
                                 ^";
-  core::String b3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<String>'.
+  core::String b3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<String>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var b3 = genericInlineClass.it = '42'; // Error, should not
                               ^^" in genericInlineClass.{<unresolved>}it = "42";
@@ -578,7 +578,7 @@ Try changing the operand or remove the type arguments.
                                  ^";
   core::String c3 = (functionInlineClass as{Unchecked} () → core::String)(){() → core::String};
   core::String c4 = (functionInlineClass as{Unchecked} () → core::String)(){() → core::String};
-  () → core::String c5 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<String>'.
+  () → core::String c5 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<String>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var c5 = functionInlineClass.it = () => '42'; // Error, should not
                                ^^" in functionInlineClass.{<unresolved>}it = () → core::String => "42";
@@ -587,7 +587,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   () → core::int d3 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   core::int d4 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>(){() → core::int};
   core::int d5 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>(){() → core::int};
-  <T extends core::Object? = dynamic>() → Never d6 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+  <T extends core::Object? = dynamic>() → Never d6 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var d6 = genericFunctionInlineClass.it = <T>() => throw ''; // Error, should
                                       ^^" in genericFunctionInlineClass.{<unresolved>}it = <T extends core::Object? = dynamic>() → Never => throw "";
@@ -597,7 +597,7 @@ Try changing the operand or remove the type arguments.
   var e2 = dynamicInlineClass.it<int>; // Error
                                 ^";
   dynamic e3 = (dynamicInlineClass as{Unchecked} dynamic){dynamic}();
-  core::String e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+  core::String e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var e4 = dynamicInlineClass.it = '42'; // Error, should not resolve
                               ^^" in dynamicInlineClass.{<unresolved>}it = "42";
@@ -606,7 +606,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
 Try changing the operand or remove the type arguments.
   var f2 = erroneousInlineClass.a<int>; // Error
                                  ^";
-  core::int f3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+  core::int f3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
   var f3 = erroneousInlineClass.a = 42; // Error, should not resolve
                                 ^" in erroneousInlineClass.{<unresolved>}a = 42;
@@ -615,19 +615,19 @@ Try correcting the name to the name of an existing setter, or defining a setter
 Try changing the operand or remove the type arguments.
   var g2 = erroneousInlineClass.a<int>; // Error
                                  ^";
-  core::String g3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+  core::String g3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
   var g3 = erroneousInlineClass.b = '42'; // Error, should not resolve
                                 ^" in erroneousInlineClass.{<unresolved>}b = "42";
-  dynamic h1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+  dynamic h1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h1 = privateInlineClass._it; // Error
                               ^^^" in privateInlineClass{<unresolved>}._it;
-  dynamic h2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+  dynamic h2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h2 = privateInlineClass._it<int>; // Error
                               ^^^" in privateInlineClass{<unresolved>}._it;
-  core::int h3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+  core::int h3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
   var h3 = privateInlineClass._it = 42; // Error
                               ^^^" in privateInlineClass.{<unresolved>}_it = 42;
@@ -647,12 +647,12 @@ library;
 //     var b2 = _it<int>; // Error
 //                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
 //     var c1 = this._it = 42; // Error, should not resolve to extension method.
 //                   ^^^
 //
-// pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
 //     var c2 = _it = 42; // Error, should not resolve to extension method.
 //              ^^^
@@ -684,11 +684,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = _it<int>; // Error
                 ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
     var c1 = this._it = 42; // Error, should not resolve to extension method.
                   ^^^" in #this.{<unresolved>}_it = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
     var c2 = _it = 42; // Error, should not resolve to extension method.
              ^^^" in #this.{<unresolved>}_it = 42;
diff --git a/pkg/front_end/testcases/extension_types/field_access.dart.strong.modular.expect b/pkg/front_end/testcases/extension_types/field_access.dart.strong.modular.expect
index ebedbabd22c..c3a45b1ba06 100644
--- a/pkg/front_end/testcases/extension_types/field_access.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extension_types/field_access.dart.strong.modular.expect
@@ -16,12 +16,12 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = 42; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = 42; // Error, should not resolve to extension method.
 //              ^^
@@ -36,12 +36,12 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //              ^^
@@ -56,32 +56,32 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //              ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                        ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //                   ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //              ^^
@@ -96,12 +96,12 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = 42; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = 42; // Error, should not resolve to extension method.
 //              ^^
@@ -126,62 +126,62 @@ library;
 //     var b4 = b<int>; // Error
 //               ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
 //     var c1 = this.a = 42; // Error
 //                   ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
 //     var c2 = a = 42; // Error
 //              ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
 //     var c3 = this.b = '42'; // Error
 //                   ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
 //     var c4 = b = '42'; // Error
 //              ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d1 = this.a(); // Error
 //                    ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d2 = a(); // Error
 //               ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d3 = this.a.call(); // Error
 //                     ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d4 = a.call(); // Error
 //                ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e1 = this.b(); // Error
 //                    ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e2 = b(); // Error
 //               ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e3 = this.b.call(); // Error
 //                     ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e4 = b.call(); // Error
 //                ^^^^
@@ -191,7 +191,7 @@ library;
 //   var a2 = inlineClass.it<int>; // Error
 //                          ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var a3 = inlineClass.it = 42; // Error,
 //                        ^^
@@ -201,7 +201,7 @@ library;
 //   var b2 = genericInlineClass.it<int>; // Error
 //                                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<String>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<String>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var b3 = genericInlineClass.it = '42'; // Error, should not
 //                               ^^
@@ -211,12 +211,12 @@ library;
 //   var c2 = functionInlineClass.it<int>; // Error
 //                                  ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<String>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<String>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var c5 = functionInlineClass.it = () => '42'; // Error, should not
 //                                ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var d6 = genericFunctionInlineClass.it = <T>() => throw ''; // Error, should
 //                                       ^^
@@ -226,7 +226,7 @@ library;
 //   var e2 = dynamicInlineClass.it<int>; // Error
 //                                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var e4 = dynamicInlineClass.it = '42'; // Error, should not resolve
 //                               ^^
@@ -236,7 +236,7 @@ library;
 //   var f2 = erroneousInlineClass.a<int>; // Error
 //                                  ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
 //   var f3 = erroneousInlineClass.a = 42; // Error, should not resolve
 //                                 ^
@@ -246,22 +246,22 @@ library;
 //   var g2 = erroneousInlineClass.a<int>; // Error
 //                                  ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
 //   var g3 = erroneousInlineClass.b = '42'; // Error, should not resolve
 //                                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
 //   var h1 = privateInlineClass._it; // Error
 //                               ^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
 //   var h2 = privateInlineClass._it<int>; // Error
 //                               ^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
 //   var h3 = privateInlineClass._it = 42; // Error
 //                               ^^^
@@ -335,11 +335,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = 42; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = 42; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = 42;
@@ -363,11 +363,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  self::GenericInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+  self::GenericInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = t;
-  self::GenericInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+  self::GenericInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = t; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = t;
@@ -391,11 +391,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  () → self::FunctionInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+  () → self::FunctionInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = t;
-  () → self::FunctionInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+  () → self::FunctionInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = t; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = t;
@@ -419,17 +419,17 @@ static extension-type-member method GenericFunctionInlineClass|test(lowered fina
   () → core::int a4 = (#this as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int b1 = (#this as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int b2 = (#this as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
-  dynamic c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+  dynamic c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
-                  ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+                  ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
                        ^" in #this{<unresolved>}.t;
-  dynamic c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+  dynamic c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = t; // Error, should not resolve to extension method.
-             ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+             ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
     var c2 = it = t; // Error, should not resolve to extension method.
                   ^" in #this{<unresolved>}.t;
@@ -459,11 +459,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = 42; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = 42; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = 42;
@@ -501,51 +501,51 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b4 = b<int>; // Error
               ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
     var c1 = this.a = 42; // Error
                   ^" in #this.{<unresolved>}a = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
     var c2 = a = 42; // Error
              ^" in #this.{<unresolved>}a = 42;
-  core::String c3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+  core::String c3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
     var c3 = this.b = '42'; // Error
                   ^" in #this.{<unresolved>}b = "42";
-  core::String c4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+  core::String c4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
     var c4 = b = '42'; // Error
              ^" in #this.{<unresolved>}b = "42";
-  dynamic d1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d1 = this.a(); // Error
                    ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic d2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d2 = a(); // Error
               ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic d3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d3 = this.a.call(); // Error
                     ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic d4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d4 = a.call(); // Error
                ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic e1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e1 = this.b(); // Error
                    ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
-  dynamic e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e2 = b(); // Error
               ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
-  dynamic e3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e3 = this.b.call(); // Error
                     ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
-  dynamic e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e4 = b.call(); // Error
                ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
@@ -558,7 +558,7 @@ static method test(self::InlineClass% /* erasure=core::int, declared=! */ inline
 Try changing the operand or remove the type arguments.
   var a2 = inlineClass.it<int>; // Error
                          ^";
-  core::int a3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+  core::int a3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var a3 = inlineClass.it = 42; // Error,
                        ^^" in inlineClass.{<unresolved>}it = 42;
@@ -567,7 +567,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
 Try changing the operand or remove the type arguments.
   var b2 = genericInlineClass.it<int>; // Error
                                 ^";
-  core::String b3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<String>'.
+  core::String b3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<String>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var b3 = genericInlineClass.it = '42'; // Error, should not
                               ^^" in genericInlineClass.{<unresolved>}it = "42";
@@ -578,7 +578,7 @@ Try changing the operand or remove the type arguments.
                                  ^";
   core::String c3 = (functionInlineClass as{Unchecked} () → core::String)(){() → core::String};
   core::String c4 = (functionInlineClass as{Unchecked} () → core::String)(){() → core::String};
-  () → core::String c5 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<String>'.
+  () → core::String c5 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<String>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var c5 = functionInlineClass.it = () => '42'; // Error, should not
                                ^^" in functionInlineClass.{<unresolved>}it = () → core::String => "42";
@@ -587,7 +587,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   () → core::int d3 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   core::int d4 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>(){() → core::int};
   core::int d5 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>(){() → core::int};
-  <T extends core::Object? = dynamic>() → Never d6 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+  <T extends core::Object? = dynamic>() → Never d6 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var d6 = genericFunctionInlineClass.it = <T>() => throw ''; // Error, should
                                       ^^" in genericFunctionInlineClass.{<unresolved>}it = <T extends core::Object? = dynamic>() → Never => throw "";
@@ -597,7 +597,7 @@ Try changing the operand or remove the type arguments.
   var e2 = dynamicInlineClass.it<int>; // Error
                                 ^";
   dynamic e3 = (dynamicInlineClass as{Unchecked} dynamic){dynamic}();
-  core::String e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+  core::String e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var e4 = dynamicInlineClass.it = '42'; // Error, should not resolve
                               ^^" in dynamicInlineClass.{<unresolved>}it = "42";
@@ -606,7 +606,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
 Try changing the operand or remove the type arguments.
   var f2 = erroneousInlineClass.a<int>; // Error
                                  ^";
-  core::int f3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+  core::int f3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
   var f3 = erroneousInlineClass.a = 42; // Error, should not resolve
                                 ^" in erroneousInlineClass.{<unresolved>}a = 42;
@@ -615,19 +615,19 @@ Try correcting the name to the name of an existing setter, or defining a setter
 Try changing the operand or remove the type arguments.
   var g2 = erroneousInlineClass.a<int>; // Error
                                  ^";
-  core::String g3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+  core::String g3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
   var g3 = erroneousInlineClass.b = '42'; // Error, should not resolve
                                 ^" in erroneousInlineClass.{<unresolved>}b = "42";
-  dynamic h1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+  dynamic h1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h1 = privateInlineClass._it; // Error
                               ^^^" in privateInlineClass{<unresolved>}._it;
-  dynamic h2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+  dynamic h2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h2 = privateInlineClass._it<int>; // Error
                               ^^^" in privateInlineClass{<unresolved>}._it;
-  core::int h3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+  core::int h3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
   var h3 = privateInlineClass._it = 42; // Error
                               ^^^" in privateInlineClass.{<unresolved>}_it = 42;
@@ -647,12 +647,12 @@ library;
 //     var b2 = _it<int>; // Error
 //                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
 //     var c1 = this._it = 42; // Error, should not resolve to extension method.
 //                   ^^^
 //
-// pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
 //     var c2 = _it = 42; // Error, should not resolve to extension method.
 //              ^^^
@@ -684,11 +684,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = _it<int>; // Error
                 ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
     var c1 = this._it = 42; // Error, should not resolve to extension method.
                   ^^^" in #this.{<unresolved>}_it = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
     var c2 = _it = 42; // Error, should not resolve to extension method.
              ^^^" in #this.{<unresolved>}_it = 42;
diff --git a/pkg/front_end/testcases/extension_types/field_access.dart.strong.transformed.expect b/pkg/front_end/testcases/extension_types/field_access.dart.strong.transformed.expect
index ebedbabd22c..c3a45b1ba06 100644
--- a/pkg/front_end/testcases/extension_types/field_access.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/field_access.dart.strong.transformed.expect
@@ -16,12 +16,12 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = 42; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = 42; // Error, should not resolve to extension method.
 //              ^^
@@ -36,12 +36,12 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //              ^^
@@ -56,32 +56,32 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //              ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                        ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = t; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //                   ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = t; // Error, should not resolve to extension method.
 //              ^^
@@ -96,12 +96,12 @@ library;
 //     var b2 = it<int>; // Error
 //                ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c1 = this.it = 42; // Error, should not resolve to extension method.
 //                   ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //     var c2 = it = 42; // Error, should not resolve to extension method.
 //              ^^
@@ -126,62 +126,62 @@ library;
 //     var b4 = b<int>; // Error
 //               ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
 //     var c1 = this.a = 42; // Error
 //                   ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
 //     var c2 = a = 42; // Error
 //              ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
 //     var c3 = this.b = '42'; // Error
 //                   ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
 //     var c4 = b = '42'; // Error
 //              ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d1 = this.a(); // Error
 //                    ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d2 = a(); // Error
 //               ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d3 = this.a.call(); // Error
 //                     ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var d4 = a.call(); // Error
 //                ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e1 = this.b(); // Error
 //                    ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e2 = b(); // Error
 //               ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e3 = this.b.call(); // Error
 //                     ^^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     var e4 = b.call(); // Error
 //                ^^^^
@@ -191,7 +191,7 @@ library;
 //   var a2 = inlineClass.it<int>; // Error
 //                          ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var a3 = inlineClass.it = 42; // Error,
 //                        ^^
@@ -201,7 +201,7 @@ library;
 //   var b2 = genericInlineClass.it<int>; // Error
 //                                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<String>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<String>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var b3 = genericInlineClass.it = '42'; // Error, should not
 //                               ^^
@@ -211,12 +211,12 @@ library;
 //   var c2 = functionInlineClass.it<int>; // Error
 //                                  ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<String>'.
+// pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<String>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var c5 = functionInlineClass.it = () => '42'; // Error, should not
 //                                ^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var d6 = genericFunctionInlineClass.it = <T>() => throw ''; // Error, should
 //                                       ^^
@@ -226,7 +226,7 @@ library;
 //   var e2 = dynamicInlineClass.it<int>; // Error
 //                                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
 //   var e4 = dynamicInlineClass.it = '42'; // Error, should not resolve
 //                               ^^
@@ -236,7 +236,7 @@ library;
 //   var f2 = erroneousInlineClass.a<int>; // Error
 //                                  ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
 //   var f3 = erroneousInlineClass.a = 42; // Error, should not resolve
 //                                 ^
@@ -246,22 +246,22 @@ library;
 //   var g2 = erroneousInlineClass.a<int>; // Error
 //                                  ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
 //   var g3 = erroneousInlineClass.b = '42'; // Error, should not resolve
 //                                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
 //   var h1 = privateInlineClass._it; // Error
 //                               ^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
 //   var h2 = privateInlineClass._it<int>; // Error
 //                               ^^^
 //
-// pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
 //   var h3 = privateInlineClass._it = 42; // Error
 //                               ^^^
@@ -335,11 +335,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:17:19: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = 42; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:18:14: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = 42; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = 42;
@@ -363,11 +363,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  self::GenericInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+  self::GenericInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:28:19: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = t;
-  self::GenericInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<T>'.
+  self::GenericInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:29:14: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = t; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = t;
@@ -391,11 +391,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  () → self::FunctionInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+  () → self::FunctionInlineClass|test::T% c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:39:19: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = t;
-  () → self::FunctionInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<T>'.
+  () → self::FunctionInlineClass|test::T% c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:40:14: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = t; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = t;
@@ -419,17 +419,17 @@ static extension-type-member method GenericFunctionInlineClass|test(lowered fina
   () → core::int a4 = (#this as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int b1 = (#this as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int b2 = (#this as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
-  dynamic c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+  dynamic c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:19: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
-                  ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+                  ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:56:24: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
     var c1 = this.it = t; // Error, should not resolve to extension method.
                        ^" in #this{<unresolved>}.t;
-  dynamic c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+  dynamic c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:14: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = t; // Error, should not resolve to extension method.
-             ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the class 'GenericFunctionInlineClass'.
+             ^^" in #this.{<unresolved>}it = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:57:19: Error: The getter 't' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 't'.
     var c2 = it = t; // Error, should not resolve to extension method.
                   ^" in #this{<unresolved>}.t;
@@ -459,11 +459,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = it<int>; // Error
                ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:74:19: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c1 = this.it = 42; // Error, should not resolve to extension method.
                   ^^" in #this.{<unresolved>}it = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:75:14: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
     var c2 = it = 42; // Error, should not resolve to extension method.
              ^^" in #this.{<unresolved>}it = 42;
@@ -501,51 +501,51 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b4 = b<int>; // Error
               ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:93:19: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
     var c1 = this.a = 42; // Error
                   ^" in #this.{<unresolved>}a = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:94:14: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
     var c2 = a = 42; // Error
              ^" in #this.{<unresolved>}a = 42;
-  core::String c3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+  core::String c3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:95:19: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
     var c3 = this.b = '42'; // Error
                   ^" in #this.{<unresolved>}b = "42";
-  core::String c4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+  core::String c4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:96:14: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
     var c4 = b = '42'; // Error
              ^" in #this.{<unresolved>}b = "42";
-  dynamic d1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:97:20: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d1 = this.a(); // Error
                    ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic d2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:98:15: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d2 = a(); // Error
               ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic d3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:99:21: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d3 = this.a.call(); // Error
                     ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic d4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the class 'int'.
+  dynamic d4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:100:16: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d4 = a.call(); // Error
                ^^^^" in (#this as{Unchecked} core::int){<unresolved>}.call();
-  dynamic e1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:101:20: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e1 = this.b(); // Error
                    ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
-  dynamic e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:102:15: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e2 = b(); // Error
               ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
-  dynamic e3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:103:21: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e3 = this.b.call(); // Error
                     ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
-  dynamic e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the class 'String'.
+  dynamic e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:104:16: Error: The method 'call' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var e4 = b.call(); // Error
                ^^^^" in (#this as{Unchecked} core::String){<unresolved>}.call();
@@ -558,7 +558,7 @@ static method test(self::InlineClass% /* erasure=core::int, declared=! */ inline
 Try changing the operand or remove the type arguments.
   var a2 = inlineClass.it<int>; // Error
                          ^";
-  core::int a3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the class 'InlineClass'.
+  core::int a3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:119:24: Error: The setter 'it' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var a3 = inlineClass.it = 42; // Error,
                        ^^" in inlineClass.{<unresolved>}it = 42;
@@ -567,7 +567,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
 Try changing the operand or remove the type arguments.
   var b2 = genericInlineClass.it<int>; // Error
                                 ^";
-  core::String b3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the class 'GenericInlineClass<String>'.
+  core::String b3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:124:31: Error: The setter 'it' isn't defined for the type 'GenericInlineClass<String>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var b3 = genericInlineClass.it = '42'; // Error, should not
                               ^^" in genericInlineClass.{<unresolved>}it = "42";
@@ -578,7 +578,7 @@ Try changing the operand or remove the type arguments.
                                  ^";
   core::String c3 = (functionInlineClass as{Unchecked} () → core::String)(){() → core::String};
   core::String c4 = (functionInlineClass as{Unchecked} () → core::String)(){() → core::String};
-  () → core::String c5 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the class 'FunctionInlineClass<String>'.
+  () → core::String c5 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:131:32: Error: The setter 'it' isn't defined for the type 'FunctionInlineClass<String>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var c5 = functionInlineClass.it = () => '42'; // Error, should not
                                ^^" in functionInlineClass.{<unresolved>}it = () → core::String => "42";
@@ -587,7 +587,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   () → core::int d3 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   core::int d4 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>(){() → core::int};
   core::int d5 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>(){() → core::int};
-  <T extends core::Object? = dynamic>() → Never d6 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the class 'GenericFunctionInlineClass'.
+  <T extends core::Object? = dynamic>() → Never d6 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:139:39: Error: The setter 'it' isn't defined for the type 'GenericFunctionInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var d6 = genericFunctionInlineClass.it = <T>() => throw ''; // Error, should
                                       ^^" in genericFunctionInlineClass.{<unresolved>}it = <T extends core::Object? = dynamic>() → Never => throw "";
@@ -597,7 +597,7 @@ Try changing the operand or remove the type arguments.
   var e2 = dynamicInlineClass.it<int>; // Error
                                 ^";
   dynamic e3 = (dynamicInlineClass as{Unchecked} dynamic){dynamic}();
-  core::String e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the class 'DynamicInlineClass'.
+  core::String e4 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:145:31: Error: The setter 'it' isn't defined for the type 'DynamicInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'it'.
   var e4 = dynamicInlineClass.it = '42'; // Error, should not resolve
                               ^^" in dynamicInlineClass.{<unresolved>}it = "42";
@@ -606,7 +606,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
 Try changing the operand or remove the type arguments.
   var f2 = erroneousInlineClass.a<int>; // Error
                                  ^";
-  core::int f3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the class 'ErroneousInlineClass'.
+  core::int f3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:150:33: Error: The setter 'a' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'a'.
   var f3 = erroneousInlineClass.a = 42; // Error, should not resolve
                                 ^" in erroneousInlineClass.{<unresolved>}a = 42;
@@ -615,19 +615,19 @@ Try correcting the name to the name of an existing setter, or defining a setter
 Try changing the operand or remove the type arguments.
   var g2 = erroneousInlineClass.a<int>; // Error
                                  ^";
-  core::String g3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the class 'ErroneousInlineClass'.
+  core::String g3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:154:33: Error: The setter 'b' isn't defined for the type 'ErroneousInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'b'.
   var g3 = erroneousInlineClass.b = '42'; // Error, should not resolve
                                 ^" in erroneousInlineClass.{<unresolved>}b = "42";
-  dynamic h1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+  dynamic h1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:157:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h1 = privateInlineClass._it; // Error
                               ^^^" in privateInlineClass{<unresolved>}._it;
-  dynamic h2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the class 'PrivateInlineClass'.
+  dynamic h2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:158:31: Error: The getter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h2 = privateInlineClass._it<int>; // Error
                               ^^^" in privateInlineClass{<unresolved>}._it;
-  core::int h3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+  core::int h3 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:159:31: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
   var h3 = privateInlineClass._it = 42; // Error
                               ^^^" in privateInlineClass.{<unresolved>}_it = 42;
@@ -647,12 +647,12 @@ library;
 //     var b2 = _it<int>; // Error
 //                 ^
 //
-// pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
 //     var c1 = this._it = 42; // Error, should not resolve to extension method.
 //                   ^^^
 //
-// pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+// pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
 //     var c2 = _it = 42; // Error, should not resolve to extension method.
 //              ^^^
@@ -684,11 +684,11 @@ Try changing the operand or remove the type arguments.
 Try changing the operand or remove the type arguments.
     var b2 = _it<int>; // Error
                 ^";
-  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+  core::int c1 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:11:19: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
     var c1 = this._it = 42; // Error, should not resolve to extension method.
                   ^^^" in #this.{<unresolved>}_it = 42;
-  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the class 'PrivateInlineClass'.
+  core::int c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access_lib.dart:12:14: Error: The setter '_it' isn't defined for the type 'PrivateInlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_it'.
     var c2 = _it = 42; // Error, should not resolve to extension method.
              ^^^" in #this.{<unresolved>}_it = 42;
diff --git a/pkg/front_end/testcases/extension_types/implements.dart.strong.expect b/pkg/front_end/testcases/extension_types/implements.dart.strong.expect
index d6d57b76072..ddcd13d6406 100644
--- a/pkg/front_end/testcases/extension_types/implements.dart.strong.expect
+++ b/pkg/front_end/testcases/extension_types/implements.dart.strong.expect
@@ -2,97 +2,97 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
 //   a.methodB(); // Error
 //     ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   a.methodC1(); // Error
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   a.methodC2(); // Error
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   a.methodD1(); // Error
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
 //   b1.methodA(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   b1.methodC1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   b1.methodC2(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   b1.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
 //   b2.methodA(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   b2.methodC1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   b2.methodC2(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   b2.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the class 'C1'.
+// pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the type 'C1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
 //   c1.methodB(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the class 'C1'.
+// pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the type 'C1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   c1.methodC2(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the class 'C1'.
+// pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the type 'C1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   c1.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the type 'C2'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   c2.methodC1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the type 'C2'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   c2.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the class 'D1'.
+// pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the type 'D1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
 //   d1.methodB(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the class 'D1'.
+// pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the type 'D1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   d1.methodC2(); // Error
 //      ^^^^^^^^
@@ -286,79 +286,79 @@ static extension-type-member method D1|methodD1(lowered final self::D1% /* erasu
 static extension-type-member method D1|get#methodD1(lowered final self::D1% /* erasure=core::int, declared=! */ #this) → () → core::int
   return () → core::int => self::D1|methodD1(#this);
 static method errors(self::A% /* erasure=core::int, declared=! */ a, self::B<core::String>% /* erasure=core::String, declared=! */ b1, self::B<core::num>% /* erasure=core::num, declared=! */ b2, self::C1% /* erasure=core::int, declared=! */ c1, self::C2% /* erasure=core::int, declared=! */ c2, self::D1% /* erasure=core::int, declared=! */ d1) → dynamic {
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
   a.methodB(); // Error
     ^^^^^^^" in a{<unresolved>}.methodB();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   a.methodC1(); // Error
     ^^^^^^^^" in a{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   a.methodC2(); // Error
     ^^^^^^^^" in a{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   a.methodD1(); // Error
     ^^^^^^^^" in a{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
   b1.methodA(); // Error
      ^^^^^^^" in b1{<unresolved>}.methodA();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   b1.methodC1(); // Error
      ^^^^^^^^" in b1{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   b1.methodC2(); // Error
      ^^^^^^^^" in b1{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   b1.methodD1(); // Error
      ^^^^^^^^" in b1{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
   b2.methodA(); // Error
      ^^^^^^^" in b2{<unresolved>}.methodA();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   b2.methodC1(); // Error
      ^^^^^^^^" in b2{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   b2.methodC2(); // Error
      ^^^^^^^^" in b2{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   b2.methodD1(); // Error
      ^^^^^^^^" in b2{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the class 'C1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the type 'C1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
   c1.methodB(); // Error
      ^^^^^^^" in c1{<unresolved>}.methodB();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the class 'C1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the type 'C1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   c1.methodC2(); // Error
      ^^^^^^^^" in c1{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the class 'C1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the type 'C1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   c1.methodD1(); // Error
      ^^^^^^^^" in c1{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the class 'C2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the type 'C2'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   c2.methodC1(); // Error
      ^^^^^^^^" in c2{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the class 'C2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the type 'C2'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   c2.methodD1(); // Error
      ^^^^^^^^" in c2{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the class 'D1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the type 'D1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
   d1.methodB(); // Error
      ^^^^^^^" in d1{<unresolved>}.methodB();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the class 'D1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the type 'D1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   d1.methodC2(); // Error
      ^^^^^^^^" in d1{<unresolved>}.methodC2();
diff --git a/pkg/front_end/testcases/extension_types/implements.dart.strong.modular.expect b/pkg/front_end/testcases/extension_types/implements.dart.strong.modular.expect
index d6d57b76072..ddcd13d6406 100644
--- a/pkg/front_end/testcases/extension_types/implements.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extension_types/implements.dart.strong.modular.expect
@@ -2,97 +2,97 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
 //   a.methodB(); // Error
 //     ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   a.methodC1(); // Error
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   a.methodC2(); // Error
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   a.methodD1(); // Error
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
 //   b1.methodA(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   b1.methodC1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   b1.methodC2(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   b1.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
 //   b2.methodA(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   b2.methodC1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   b2.methodC2(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   b2.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the class 'C1'.
+// pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the type 'C1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
 //   c1.methodB(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the class 'C1'.
+// pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the type 'C1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   c1.methodC2(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the class 'C1'.
+// pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the type 'C1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   c1.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the type 'C2'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   c2.methodC1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the type 'C2'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   c2.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the class 'D1'.
+// pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the type 'D1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
 //   d1.methodB(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the class 'D1'.
+// pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the type 'D1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   d1.methodC2(); // Error
 //      ^^^^^^^^
@@ -286,79 +286,79 @@ static extension-type-member method D1|methodD1(lowered final self::D1% /* erasu
 static extension-type-member method D1|get#methodD1(lowered final self::D1% /* erasure=core::int, declared=! */ #this) → () → core::int
   return () → core::int => self::D1|methodD1(#this);
 static method errors(self::A% /* erasure=core::int, declared=! */ a, self::B<core::String>% /* erasure=core::String, declared=! */ b1, self::B<core::num>% /* erasure=core::num, declared=! */ b2, self::C1% /* erasure=core::int, declared=! */ c1, self::C2% /* erasure=core::int, declared=! */ c2, self::D1% /* erasure=core::int, declared=! */ d1) → dynamic {
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
   a.methodB(); // Error
     ^^^^^^^" in a{<unresolved>}.methodB();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   a.methodC1(); // Error
     ^^^^^^^^" in a{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   a.methodC2(); // Error
     ^^^^^^^^" in a{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   a.methodD1(); // Error
     ^^^^^^^^" in a{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
   b1.methodA(); // Error
      ^^^^^^^" in b1{<unresolved>}.methodA();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   b1.methodC1(); // Error
      ^^^^^^^^" in b1{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   b1.methodC2(); // Error
      ^^^^^^^^" in b1{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   b1.methodD1(); // Error
      ^^^^^^^^" in b1{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
   b2.methodA(); // Error
      ^^^^^^^" in b2{<unresolved>}.methodA();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   b2.methodC1(); // Error
      ^^^^^^^^" in b2{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   b2.methodC2(); // Error
      ^^^^^^^^" in b2{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   b2.methodD1(); // Error
      ^^^^^^^^" in b2{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the class 'C1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the type 'C1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
   c1.methodB(); // Error
      ^^^^^^^" in c1{<unresolved>}.methodB();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the class 'C1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the type 'C1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   c1.methodC2(); // Error
      ^^^^^^^^" in c1{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the class 'C1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the type 'C1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   c1.methodD1(); // Error
      ^^^^^^^^" in c1{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the class 'C2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the type 'C2'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   c2.methodC1(); // Error
      ^^^^^^^^" in c2{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the class 'C2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the type 'C2'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   c2.methodD1(); // Error
      ^^^^^^^^" in c2{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the class 'D1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the type 'D1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
   d1.methodB(); // Error
      ^^^^^^^" in d1{<unresolved>}.methodB();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the class 'D1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the type 'D1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   d1.methodC2(); // Error
      ^^^^^^^^" in d1{<unresolved>}.methodC2();
diff --git a/pkg/front_end/testcases/extension_types/implements.dart.strong.transformed.expect b/pkg/front_end/testcases/extension_types/implements.dart.strong.transformed.expect
index 9cc3faeedd8..c4d760038d1 100644
--- a/pkg/front_end/testcases/extension_types/implements.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/implements.dart.strong.transformed.expect
@@ -2,97 +2,97 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
 //   a.methodB(); // Error
 //     ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   a.methodC1(); // Error
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   a.methodC2(); // Error
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the class 'A'.
+// pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the type 'A'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   a.methodD1(); // Error
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
 //   b1.methodA(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   b1.methodC1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   b1.methodC2(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the class 'B<String>'.
+// pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the type 'B<String>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   b1.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
 //   b2.methodA(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   b2.methodC1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   b2.methodC2(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the class 'B<num>'.
+// pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the type 'B<num>'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   b2.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the class 'C1'.
+// pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the type 'C1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
 //   c1.methodB(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the class 'C1'.
+// pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the type 'C1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   c1.methodC2(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the class 'C1'.
+// pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the type 'C1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   c1.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the type 'C2'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
 //   c2.methodC1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the type 'C2'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
 //   c2.methodD1(); // Error
 //      ^^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the class 'D1'.
+// pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the type 'D1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
 //   d1.methodB(); // Error
 //      ^^^^^^^
 //
-// pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the class 'D1'.
+// pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the type 'D1'.
 // Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
 //   d1.methodC2(); // Error
 //      ^^^^^^^^
@@ -286,79 +286,79 @@ static extension-type-member method D1|methodD1(lowered final self::D1% /* erasu
 static extension-type-member method D1|get#methodD1(lowered final self::D1% /* erasure=core::int, declared=! */ #this) → () → core::int
   return () → core::int => self::D1|methodD1(#this);
 static method errors(self::A% /* erasure=core::int, declared=! */ a, self::B<core::String>% /* erasure=core::String, declared=! */ b1, self::B<core::num>% /* erasure=core::num, declared=! */ b2, self::C1% /* erasure=core::int, declared=! */ c1, self::C2% /* erasure=core::int, declared=! */ c2, self::D1% /* erasure=core::int, declared=! */ d1) → dynamic {
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:26:5: Error: The method 'methodB' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
   a.methodB(); // Error
     ^^^^^^^" in a{<unresolved>}.methodB();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:27:5: Error: The method 'methodC1' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   a.methodC1(); // Error
     ^^^^^^^^" in a{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:28:5: Error: The method 'methodC2' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   a.methodC2(); // Error
     ^^^^^^^^" in a{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:29:5: Error: The method 'methodD1' isn't defined for the type 'A'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   a.methodD1(); // Error
     ^^^^^^^^" in a{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:31:6: Error: The method 'methodA' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
   b1.methodA(); // Error
      ^^^^^^^" in b1{<unresolved>}.methodA();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:32:6: Error: The method 'methodC1' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   b1.methodC1(); // Error
      ^^^^^^^^" in b1{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:33:6: Error: The method 'methodC2' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   b1.methodC2(); // Error
      ^^^^^^^^" in b1{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the class 'B<String>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:34:6: Error: The method 'methodD1' isn't defined for the type 'B<String>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   b1.methodD1(); // Error
      ^^^^^^^^" in b1{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:36:6: Error: The method 'methodA' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodA'.
   b2.methodA(); // Error
      ^^^^^^^" in b2{<unresolved>}.methodA();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:37:6: Error: The method 'methodC1' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   b2.methodC1(); // Error
      ^^^^^^^^" in b2{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:38:6: Error: The method 'methodC2' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   b2.methodC2(); // Error
      ^^^^^^^^" in b2{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the class 'B<num>'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:39:6: Error: The method 'methodD1' isn't defined for the type 'B<num>'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   b2.methodD1(); // Error
      ^^^^^^^^" in b2{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the class 'C1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:41:6: Error: The method 'methodB' isn't defined for the type 'C1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
   c1.methodB(); // Error
      ^^^^^^^" in c1{<unresolved>}.methodB();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the class 'C1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:42:6: Error: The method 'methodC2' isn't defined for the type 'C1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   c1.methodC2(); // Error
      ^^^^^^^^" in c1{<unresolved>}.methodC2();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the class 'C1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:43:6: Error: The method 'methodD1' isn't defined for the type 'C1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   c1.methodD1(); // Error
      ^^^^^^^^" in c1{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the class 'C2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:45:6: Error: The method 'methodC1' isn't defined for the type 'C2'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC1'.
   c2.methodC1(); // Error
      ^^^^^^^^" in c2{<unresolved>}.methodC1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the class 'C2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:46:6: Error: The method 'methodD1' isn't defined for the type 'C2'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodD1'.
   c2.methodD1(); // Error
      ^^^^^^^^" in c2{<unresolved>}.methodD1();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the class 'D1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:48:6: Error: The method 'methodB' isn't defined for the type 'D1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodB'.
   d1.methodB(); // Error
      ^^^^^^^" in d1{<unresolved>}.methodB();
-  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the class 'D1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/implements.dart:49:6: Error: The method 'methodC2' isn't defined for the type 'D1'.
 Try correcting the name to the name of an existing method, or defining a method named 'methodC2'.
   d1.methodC2(); // Error
      ^^^^^^^^" in d1{<unresolved>}.methodC2();
diff --git a/pkg/front_end/testcases/extension_types/issue52284.dart.strong.expect b/pkg/front_end/testcases/extension_types/issue52284.dart.strong.expect
index d552270be0d..ef20fff0503 100644
--- a/pkg/front_end/testcases/extension_types/issue52284.dart.strong.expect
+++ b/pkg/front_end/testcases/extension_types/issue52284.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the class 'Id'.
+// pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the type 'Id'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //   print(c.unresolved); // Error
 //           ^^^^^^^^^^
@@ -23,7 +23,7 @@ static extension-type-member synthetic method Id|constructor#_#new#tearOff(core:
   return self::Id|constructor#(id);
 static method test() → dynamic {
   self::Id% /* erasure=core::int, declared=! */ c = self::Id|constructor#(2);
-  core::print(invalid-expression "pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the class 'Id'.
+  core::print(invalid-expression "pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the type 'Id'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
   print(c.unresolved); // Error
           ^^^^^^^^^^" in c{<unresolved>}.unresolved);
diff --git a/pkg/front_end/testcases/extension_types/issue52284.dart.strong.modular.expect b/pkg/front_end/testcases/extension_types/issue52284.dart.strong.modular.expect
index d552270be0d..ef20fff0503 100644
--- a/pkg/front_end/testcases/extension_types/issue52284.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extension_types/issue52284.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the class 'Id'.
+// pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the type 'Id'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //   print(c.unresolved); // Error
 //           ^^^^^^^^^^
@@ -23,7 +23,7 @@ static extension-type-member synthetic method Id|constructor#_#new#tearOff(core:
   return self::Id|constructor#(id);
 static method test() → dynamic {
   self::Id% /* erasure=core::int, declared=! */ c = self::Id|constructor#(2);
-  core::print(invalid-expression "pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the class 'Id'.
+  core::print(invalid-expression "pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the type 'Id'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
   print(c.unresolved); // Error
           ^^^^^^^^^^" in c{<unresolved>}.unresolved);
diff --git a/pkg/front_end/testcases/extension_types/issue52284.dart.strong.transformed.expect b/pkg/front_end/testcases/extension_types/issue52284.dart.strong.transformed.expect
index d552270be0d..ef20fff0503 100644
--- a/pkg/front_end/testcases/extension_types/issue52284.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/issue52284.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the class 'Id'.
+// pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the type 'Id'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //   print(c.unresolved); // Error
 //           ^^^^^^^^^^
@@ -23,7 +23,7 @@ static extension-type-member synthetic method Id|constructor#_#new#tearOff(core:
   return self::Id|constructor#(id);
 static method test() → dynamic {
   self::Id% /* erasure=core::int, declared=! */ c = self::Id|constructor#(2);
-  core::print(invalid-expression "pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the class 'Id'.
+  core::print(invalid-expression "pkg/front_end/testcases/extension_types/issue52284.dart:9:11: Error: The getter 'unresolved' isn't defined for the type 'Id'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
   print(c.unresolved); // Error
           ^^^^^^^^^^" in c{<unresolved>}.unresolved);
diff --git a/pkg/front_end/testcases/extension_types/issue53720.dart.strong.expect b/pkg/front_end/testcases/extension_types/issue53720.dart.strong.expect
index 803d3c03484..93d8c8abccb 100644
--- a/pkg/front_end/testcases/extension_types/issue53720.dart.strong.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the class 'E2'.
+// pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the type 'E2'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'm'.
 //   E2(1).m = 10; /* Error */
 //         ^
@@ -40,7 +40,7 @@ static extension-type-member method E2|m(lowered final self::E2% /* erasure=core
 static extension-type-member method E2|get#m(lowered final self::E2% /* erasure=core::int, declared=! */ #this) → () → void
   return () → void => self::E2|m(#this);
 static method test() → void {
-  invalid-expression "pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the class 'E2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the type 'E2'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'm'.
   E2(1).m = 10; /* Error */
         ^" in self::E2|constructor#(1).{<unresolved>}m = 10;
diff --git a/pkg/front_end/testcases/extension_types/issue53720.dart.strong.modular.expect b/pkg/front_end/testcases/extension_types/issue53720.dart.strong.modular.expect
index 803d3c03484..93d8c8abccb 100644
--- a/pkg/front_end/testcases/extension_types/issue53720.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the class 'E2'.
+// pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the type 'E2'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'm'.
 //   E2(1).m = 10; /* Error */
 //         ^
@@ -40,7 +40,7 @@ static extension-type-member method E2|m(lowered final self::E2% /* erasure=core
 static extension-type-member method E2|get#m(lowered final self::E2% /* erasure=core::int, declared=! */ #this) → () → void
   return () → void => self::E2|m(#this);
 static method test() → void {
-  invalid-expression "pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the class 'E2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the type 'E2'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'm'.
   E2(1).m = 10; /* Error */
         ^" in self::E2|constructor#(1).{<unresolved>}m = 10;
diff --git a/pkg/front_end/testcases/extension_types/issue53720.dart.strong.transformed.expect b/pkg/front_end/testcases/extension_types/issue53720.dart.strong.transformed.expect
index 803d3c03484..93d8c8abccb 100644
--- a/pkg/front_end/testcases/extension_types/issue53720.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the class 'E2'.
+// pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the type 'E2'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'm'.
 //   E2(1).m = 10; /* Error */
 //         ^
@@ -40,7 +40,7 @@ static extension-type-member method E2|m(lowered final self::E2% /* erasure=core
 static extension-type-member method E2|get#m(lowered final self::E2% /* erasure=core::int, declared=! */ #this) → () → void
   return () → void => self::E2|m(#this);
 static method test() → void {
-  invalid-expression "pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the class 'E2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/issue53720.dart:14:9: Error: The setter 'm' isn't defined for the type 'E2'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'm'.
   E2(1).m = 10; /* Error */
         ^" in self::E2|constructor#(1).{<unresolved>}m = 10;
diff --git a/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.expect b/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.expect
index 4f8c5b60570..d33dfbc7537 100644
--- a/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class 'E2'.
+// pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the type 'E2'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
 //   e2.m1 = 10; // Compile-time error.
 //      ^^
 //
-// pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the class 'E2'.
+// pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the type 'E2'.
 // Try correcting the name to the name of an existing method, or defining a method named 'm2'.
 //   e2.m2(); // Compile-time error.
 //      ^^
@@ -64,12 +64,12 @@ static extension-type-member method E2|get#m4(lowered final self::E2% /* erasure
 static method test() → void {
   self::E2% /* erasure=core::int, declared=! */ e2 = self::E2|constructor#(1);
   self::E2|m1(e2);
-  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class 'E2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the type 'E2'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
   e2.m1 = 10; // Compile-time error.
      ^^" in e2.{<unresolved>}m1 = 10;
   self::E2|set#m2(e2, 10);
-  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the class 'E2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the type 'E2'.
 Try correcting the name to the name of an existing method, or defining a method named 'm2'.
   e2.m2(); // Compile-time error.
      ^^" in e2{<unresolved>}.m2();
diff --git a/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.modular.expect b/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.modular.expect
index 4f8c5b60570..d33dfbc7537 100644
--- a/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.modular.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class 'E2'.
+// pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the type 'E2'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
 //   e2.m1 = 10; // Compile-time error.
 //      ^^
 //
-// pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the class 'E2'.
+// pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the type 'E2'.
 // Try correcting the name to the name of an existing method, or defining a method named 'm2'.
 //   e2.m2(); // Compile-time error.
 //      ^^
@@ -64,12 +64,12 @@ static extension-type-member method E2|get#m4(lowered final self::E2% /* erasure
 static method test() → void {
   self::E2% /* erasure=core::int, declared=! */ e2 = self::E2|constructor#(1);
   self::E2|m1(e2);
-  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class 'E2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the type 'E2'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
   e2.m1 = 10; // Compile-time error.
      ^^" in e2.{<unresolved>}m1 = 10;
   self::E2|set#m2(e2, 10);
-  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the class 'E2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the type 'E2'.
 Try correcting the name to the name of an existing method, or defining a method named 'm2'.
   e2.m2(); // Compile-time error.
      ^^" in e2{<unresolved>}.m2();
diff --git a/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.transformed.expect b/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.transformed.expect
index 4f8c5b60570..d33dfbc7537 100644
--- a/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720_2.dart.strong.transformed.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class 'E2'.
+// pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the type 'E2'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
 //   e2.m1 = 10; // Compile-time error.
 //      ^^
 //
-// pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the class 'E2'.
+// pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the type 'E2'.
 // Try correcting the name to the name of an existing method, or defining a method named 'm2'.
 //   e2.m2(); // Compile-time error.
 //      ^^
@@ -64,12 +64,12 @@ static extension-type-member method E2|get#m4(lowered final self::E2% /* erasure
 static method test() → void {
   self::E2% /* erasure=core::int, declared=! */ e2 = self::E2|constructor#(1);
   self::E2|m1(e2);
-  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class 'E2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the type 'E2'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
   e2.m1 = 10; // Compile-time error.
      ^^" in e2.{<unresolved>}m1 = 10;
   self::E2|set#m2(e2, 10);
-  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the class 'E2'.
+  invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:24:6: Error: The method 'm2' isn't defined for the type 'E2'.
 Try correcting the name to the name of an existing method, or defining a method named 'm2'.
   e2.m2(); // Compile-time error.
      ^^" in e2{<unresolved>}.m2();
diff --git a/pkg/front_end/testcases/extension_types/method_access.dart.strong.expect b/pkg/front_end/testcases/extension_types/method_access.dart.strong.expect
index f00a8a6bb0b..716aa22a076 100644
--- a/pkg/front_end/testcases/extension_types/method_access.dart.strong.expect
+++ b/pkg/front_end/testcases/extension_types/method_access.dart.strong.expect
@@ -2,32 +2,32 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //     this.setter; // Error, should not resolve to extension method.
 //          ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //     setter; // Error, should not resolve to extension method.
 //     ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //     this.getter = 42; // Error, should not resolve to extension method.
 //          ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //     getter = 42; // Error, should not resolve to extension method.
 //     ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //   ic.setter; // Error, should not resolve to extension method.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //   ic.getter = 42; // Error, should not resolve to extension method.
 //      ^^^^^^
@@ -82,19 +82,19 @@ static extension-type-member method InlineClass|test(lowered final self::InlineC
   self::InlineClass|set#setter(#this, 87);
   (core::int) → core::int h1 = self::InlineClass|get#genericMethod(#this)<core::int>;
   (core::int) → core::int h2 = self::InlineClass|get#genericMethod(#this)<core::int>;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
     this.setter; // Error, should not resolve to extension method.
          ^^^^^^" in #this{<unresolved>}.setter;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
     setter; // Error, should not resolve to extension method.
     ^^^^^^" in #this{<unresolved>}.setter;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
     this.getter = 42; // Error, should not resolve to extension method.
          ^^^^^^" in #this.{<unresolved>}getter = 42;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
     getter = 42; // Error, should not resolve to extension method.
     ^^^^^^" in #this.{<unresolved>}getter = 42;
@@ -144,11 +144,11 @@ static method test(self::InlineClass% /* erasure=core::int, declared=! */ ic) 
   core::int g = let final core::int #t12 = 42 in let final void #t13 = self::InlineClass|set#setter(ic, #t12) in #t12;
   self::InlineClass|set#setter(ic, 87);
   (core::int) → core::int h = self::InlineClass|get#genericMethod(ic)<core::int>;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
   ic.setter; // Error, should not resolve to extension method.
      ^^^^^^" in ic{<unresolved>}.setter;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
   ic.getter = 42; // Error, should not resolve to extension method.
      ^^^^^^" in ic.{<unresolved>}getter = 42;
diff --git a/pkg/front_end/testcases/extension_types/method_access.dart.strong.modular.expect b/pkg/front_end/testcases/extension_types/method_access.dart.strong.modular.expect
index f00a8a6bb0b..716aa22a076 100644
--- a/pkg/front_end/testcases/extension_types/method_access.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extension_types/method_access.dart.strong.modular.expect
@@ -2,32 +2,32 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //     this.setter; // Error, should not resolve to extension method.
 //          ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //     setter; // Error, should not resolve to extension method.
 //     ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //     this.getter = 42; // Error, should not resolve to extension method.
 //          ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //     getter = 42; // Error, should not resolve to extension method.
 //     ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //   ic.setter; // Error, should not resolve to extension method.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //   ic.getter = 42; // Error, should not resolve to extension method.
 //      ^^^^^^
@@ -82,19 +82,19 @@ static extension-type-member method InlineClass|test(lowered final self::InlineC
   self::InlineClass|set#setter(#this, 87);
   (core::int) → core::int h1 = self::InlineClass|get#genericMethod(#this)<core::int>;
   (core::int) → core::int h2 = self::InlineClass|get#genericMethod(#this)<core::int>;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
     this.setter; // Error, should not resolve to extension method.
          ^^^^^^" in #this{<unresolved>}.setter;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
     setter; // Error, should not resolve to extension method.
     ^^^^^^" in #this{<unresolved>}.setter;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
     this.getter = 42; // Error, should not resolve to extension method.
          ^^^^^^" in #this.{<unresolved>}getter = 42;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
     getter = 42; // Error, should not resolve to extension method.
     ^^^^^^" in #this.{<unresolved>}getter = 42;
@@ -144,11 +144,11 @@ static method test(self::InlineClass% /* erasure=core::int, declared=! */ ic) 
   core::int g = let final core::int #t12 = 42 in let final void #t13 = self::InlineClass|set#setter(ic, #t12) in #t12;
   self::InlineClass|set#setter(ic, 87);
   (core::int) → core::int h = self::InlineClass|get#genericMethod(ic)<core::int>;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
   ic.setter; // Error, should not resolve to extension method.
      ^^^^^^" in ic{<unresolved>}.setter;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
   ic.getter = 42; // Error, should not resolve to extension method.
      ^^^^^^" in ic.{<unresolved>}getter = 42;
diff --git a/pkg/front_end/testcases/extension_types/method_access.dart.strong.transformed.expect b/pkg/front_end/testcases/extension_types/method_access.dart.strong.transformed.expect
index cfaaab5e97a..01e5095c8e7 100644
--- a/pkg/front_end/testcases/extension_types/method_access.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/method_access.dart.strong.transformed.expect
@@ -2,32 +2,32 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //     this.setter; // Error, should not resolve to extension method.
 //          ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //     setter; // Error, should not resolve to extension method.
 //     ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //     this.getter = 42; // Error, should not resolve to extension method.
 //          ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //     getter = 42; // Error, should not resolve to extension method.
 //     ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //   ic.setter; // Error, should not resolve to extension method.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+// pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //   ic.getter = 42; // Error, should not resolve to extension method.
 //      ^^^^^^
@@ -82,19 +82,19 @@ static extension-type-member method InlineClass|test(lowered final self::InlineC
   self::InlineClass|set#setter(#this, 87);
   (core::int) → core::int h1 = self::InlineClass|get#genericMethod(#this)<core::int>;
   (core::int) → core::int h2 = self::InlineClass|get#genericMethod(#this)<core::int>;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:27:10: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
     this.setter; // Error, should not resolve to extension method.
          ^^^^^^" in #this{<unresolved>}.setter;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:28:5: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
     setter; // Error, should not resolve to extension method.
     ^^^^^^" in #this{<unresolved>}.setter;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
     this.getter = 42; // Error, should not resolve to extension method.
          ^^^^^^" in #this.{<unresolved>}getter = 42;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:30:5: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
     getter = 42; // Error, should not resolve to extension method.
     ^^^^^^" in #this.{<unresolved>}getter = 42;
@@ -144,11 +144,11 @@ static method test(self::InlineClass% /* erasure=core::int, declared=! */ ic) 
   core::int g = let final core::int #t12 = 42 in let final void #t13 = self::InlineClass|set#setter(ic, #t12) in #t12;
   self::InlineClass|set#setter(ic, 87);
   (core::int) → core::int h = self::InlineClass|get#genericMethod(ic)<core::int>;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:73:6: Error: The getter 'setter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
   ic.setter; // Error, should not resolve to extension method.
      ^^^^^^" in ic{<unresolved>}.setter;
-  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class 'InlineClass'.
+  invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the type 'InlineClass'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
   ic.getter = 42; // Error, should not resolve to extension method.
      ^^^^^^" in ic.{<unresolved>}getter = 42;
diff --git a/pkg/front_end/testcases/extension_types/shadowing.dart.strong.expect b/pkg/front_end/testcases/extension_types/shadowing.dart.strong.expect
index af88e0280f2..a1ad6675cc0 100644
--- a/pkg/front_end/testcases/extension_types/shadowing.dart.strong.expect
+++ b/pkg/front_end/testcases/extension_types/shadowing.dart.strong.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the class 'ET1'.
+// pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the type 'ET1'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //     getter = getter;
 //     ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the class 'ET1'.
+// pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the type 'ET1'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //     setter = setter;
 //              ^^^^^^
@@ -53,11 +53,11 @@ static extension-type-member method ET1|get#getter(lowered final self::ET1% /* e
   return 42;
 static extension-type-member method ET1|set#setter(lowered final self::ET1% /* erasure=core::int, declared=! */ #this, wildcard dynamic _#wc0#formal) → void {}
 static extension-type-member method ET1|method(lowered final self::ET1% /* erasure=core::int, declared=! */ #this) → dynamic {
-  invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the class 'ET1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the type 'ET1'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
     getter = getter;
     ^^^^^^" in #this.{<unresolved>}getter = self::ET1|get#getter(#this);
-  self::ET1|set#setter(#this, invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the class 'ET1'.
+  self::ET1|set#setter(#this, invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the type 'ET1'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
     setter = setter;
              ^^^^^^" in #this{<unresolved>}.setter);
diff --git a/pkg/front_end/testcases/extension_types/shadowing.dart.strong.modular.expect b/pkg/front_end/testcases/extension_types/shadowing.dart.strong.modular.expect
index af88e0280f2..a1ad6675cc0 100644
--- a/pkg/front_end/testcases/extension_types/shadowing.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extension_types/shadowing.dart.strong.modular.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the class 'ET1'.
+// pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the type 'ET1'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //     getter = getter;
 //     ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the class 'ET1'.
+// pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the type 'ET1'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //     setter = setter;
 //              ^^^^^^
@@ -53,11 +53,11 @@ static extension-type-member method ET1|get#getter(lowered final self::ET1% /* e
   return 42;
 static extension-type-member method ET1|set#setter(lowered final self::ET1% /* erasure=core::int, declared=! */ #this, wildcard dynamic _#wc0#formal) → void {}
 static extension-type-member method ET1|method(lowered final self::ET1% /* erasure=core::int, declared=! */ #this) → dynamic {
-  invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the class 'ET1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the type 'ET1'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
     getter = getter;
     ^^^^^^" in #this.{<unresolved>}getter = self::ET1|get#getter(#this);
-  self::ET1|set#setter(#this, invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the class 'ET1'.
+  self::ET1|set#setter(#this, invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the type 'ET1'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
     setter = setter;
              ^^^^^^" in #this{<unresolved>}.setter);
diff --git a/pkg/front_end/testcases/extension_types/shadowing.dart.strong.transformed.expect b/pkg/front_end/testcases/extension_types/shadowing.dart.strong.transformed.expect
index af88e0280f2..a1ad6675cc0 100644
--- a/pkg/front_end/testcases/extension_types/shadowing.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/shadowing.dart.strong.transformed.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the class 'ET1'.
+// pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the type 'ET1'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
 //     getter = getter;
 //     ^^^^^^
 //
-// pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the class 'ET1'.
+// pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the type 'ET1'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 //     setter = setter;
 //              ^^^^^^
@@ -53,11 +53,11 @@ static extension-type-member method ET1|get#getter(lowered final self::ET1% /* e
   return 42;
 static extension-type-member method ET1|set#setter(lowered final self::ET1% /* erasure=core::int, declared=! */ #this, wildcard dynamic _#wc0#formal) → void {}
 static extension-type-member method ET1|method(lowered final self::ET1% /* erasure=core::int, declared=! */ #this) → dynamic {
-  invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the class 'ET1'.
+  invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:13:5: Error: The setter 'getter' isn't defined for the type 'ET1'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'getter'.
     getter = getter;
     ^^^^^^" in #this.{<unresolved>}getter = self::ET1|get#getter(#this);
-  self::ET1|set#setter(#this, invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the class 'ET1'.
+  self::ET1|set#setter(#this, invalid-expression "pkg/front_end/testcases/extension_types/shadowing.dart:14:14: Error: The getter 'setter' isn't defined for the type 'ET1'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
     setter = setter;
              ^^^^^^" in #this{<unresolved>}.setter);
diff --git a/pkg/front_end/testcases/extensions/call_collision.dart.strong.expect b/pkg/front_end/testcases/extensions/call_collision.dart.strong.expect
index bc0bc0c3c59..beea66f2816 100644
--- a/pkg/front_end/testcases/extensions/call_collision.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/call_collision.dart.strong.expect
@@ -2,24 +2,24 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the class 'Function'.
+// pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the type 'Function'.
 //  - 'Function' is from 'dart:core'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
 //   f1.call = 0; // Error.
 //      ^^^^
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the class 'void Function()'.
+// pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the type 'void Function()'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
 //   f2.call = 0; // Error.
 //      ^^^^
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   c1.call(); // Error.
 //      ^^^^
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
 //   c2.call = 0; // Error.
@@ -47,23 +47,23 @@ static extension-member method _extension#1|get#call(lowered final self::Class?
   return () → void => self::_extension#1|call(#this);
 static method method(core::Function f1, () → void f2, self::Class c1, self::Class? c2) → dynamic {
   f1();
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the class 'Function'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the type 'Function'.
  - 'Function' is from 'dart:core'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
   f1.call = 0; // Error.
      ^^^^" in f1.{<unresolved>}call = 0;
   f2(){() → void};
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the class 'void Function()'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the type 'void Function()'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
   f2.call = 0; // Error.
      ^^^^" in f2.{<unresolved>}call = 0;
   c1.{self::Class::call} = 0;
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   c1.call(); // Error.
      ^^^^" in c1{<unresolved>}.call();
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the class 'Class?'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
   c2.call = 0; // Error.
diff --git a/pkg/front_end/testcases/extensions/call_collision.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/call_collision.dart.strong.modular.expect
index bc0bc0c3c59..beea66f2816 100644
--- a/pkg/front_end/testcases/extensions/call_collision.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/call_collision.dart.strong.modular.expect
@@ -2,24 +2,24 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the class 'Function'.
+// pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the type 'Function'.
 //  - 'Function' is from 'dart:core'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
 //   f1.call = 0; // Error.
 //      ^^^^
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the class 'void Function()'.
+// pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the type 'void Function()'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
 //   f2.call = 0; // Error.
 //      ^^^^
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   c1.call(); // Error.
 //      ^^^^
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
 //   c2.call = 0; // Error.
@@ -47,23 +47,23 @@ static extension-member method _extension#1|get#call(lowered final self::Class?
   return () → void => self::_extension#1|call(#this);
 static method method(core::Function f1, () → void f2, self::Class c1, self::Class? c2) → dynamic {
   f1();
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the class 'Function'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the type 'Function'.
  - 'Function' is from 'dart:core'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
   f1.call = 0; // Error.
      ^^^^" in f1.{<unresolved>}call = 0;
   f2(){() → void};
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the class 'void Function()'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the type 'void Function()'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
   f2.call = 0; // Error.
      ^^^^" in f2.{<unresolved>}call = 0;
   c1.{self::Class::call} = 0;
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   c1.call(); // Error.
      ^^^^" in c1{<unresolved>}.call();
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the class 'Class?'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
   c2.call = 0; // Error.
diff --git a/pkg/front_end/testcases/extensions/call_collision.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/call_collision.dart.strong.transformed.expect
index bc0bc0c3c59..beea66f2816 100644
--- a/pkg/front_end/testcases/extensions/call_collision.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/call_collision.dart.strong.transformed.expect
@@ -2,24 +2,24 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the class 'Function'.
+// pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the type 'Function'.
 //  - 'Function' is from 'dart:core'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
 //   f1.call = 0; // Error.
 //      ^^^^
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the class 'void Function()'.
+// pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the type 'void Function()'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
 //   f2.call = 0; // Error.
 //      ^^^^
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   c1.call(); // Error.
 //      ^^^^
 //
-// pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
 //   c2.call = 0; // Error.
@@ -47,23 +47,23 @@ static extension-member method _extension#1|get#call(lowered final self::Class?
   return () → void => self::_extension#1|call(#this);
 static method method(core::Function f1, () → void f2, self::Class c1, self::Class? c2) → dynamic {
   f1();
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the class 'Function'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:19:6: Error: The setter 'call' isn't defined for the type 'Function'.
  - 'Function' is from 'dart:core'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
   f1.call = 0; // Error.
      ^^^^" in f1.{<unresolved>}call = 0;
   f2(){() → void};
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the class 'void Function()'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:21:6: Error: The setter 'call' isn't defined for the type 'void Function()'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
   f2.call = 0; // Error.
      ^^^^" in f2.{<unresolved>}call = 0;
   c1.{self::Class::call} = 0;
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:23:6: Error: The method 'call' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   c1.call(); // Error.
      ^^^^" in c1{<unresolved>}.call();
-  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the class 'Class?'.
+  invalid-expression "pkg/front_end/testcases/extensions/call_collision.dart:24:6: Error: The setter 'call' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'call'.
   c2.call = 0; // Error.
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 f7df0c94e67..1c84fb72dfc 100644
--- a/pkg/front_end/testcases/extensions/check_bounds.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/check_bounds.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the class 'Class<A>'.
+// pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the type 'Class<A>'.
 //  - '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'.
@@ -278,7 +278,7 @@ library;
 // final field29 = Extension<B>(classB).genericMethod<B>(a);
 //                                                       ^
 //
-// pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+// pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
 //  - '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'.
@@ -547,7 +547,7 @@ library;
 //   Extension<B>(classB).genericMethod<B>(a);
 //                                         ^
 //
-// pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+// pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
 //  - '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'.
@@ -844,7 +844,7 @@ extension Extension<T extends self::B> on self::Class<T> {
 static final field self::A a = new self::A::•();
 static final field self::Class<self::A> classA = new self::Class::•<self::A>();
 static final field self::Class<self::B> classB = new self::Class::•<self::B>();
-static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the class 'Class<A>'.
+static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the type 'Class<A>'.
  - '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'.
@@ -969,7 +969,7 @@ static method main() → dynamic {}
 static method test(self::A a) → dynamic {
   self::Class<self::A> classA = new self::Class::•<self::A>();
   self::Class<self::B> classB = new self::Class::•<self::B>();
-  invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+  invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
  - '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'.
@@ -1083,7 +1083,7 @@ Try correcting the name to the name of an existing method, or defining a method
 static method /* from org-dartlang-testcase:///check_bounds_lib.dart */ testInPart(self::A a) → dynamic {
   self::Class<self::A> classA = new self::Class::•<self::A>();
   self::Class<self::B> classB = new self::Class::•<self::B>();
-  invalid-expression "pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+  invalid-expression "pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
  - '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'.
diff --git a/pkg/front_end/testcases/extensions/check_bounds.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/check_bounds.dart.strong.modular.expect
index f7df0c94e67..1c84fb72dfc 100644
--- a/pkg/front_end/testcases/extensions/check_bounds.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/check_bounds.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the class 'Class<A>'.
+// pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the type 'Class<A>'.
 //  - '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'.
@@ -278,7 +278,7 @@ library;
 // final field29 = Extension<B>(classB).genericMethod<B>(a);
 //                                                       ^
 //
-// pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+// pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
 //  - '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'.
@@ -547,7 +547,7 @@ library;
 //   Extension<B>(classB).genericMethod<B>(a);
 //                                         ^
 //
-// pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+// pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
 //  - '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'.
@@ -844,7 +844,7 @@ extension Extension<T extends self::B> on self::Class<T> {
 static final field self::A a = new self::A::•();
 static final field self::Class<self::A> classA = new self::Class::•<self::A>();
 static final field self::Class<self::B> classB = new self::Class::•<self::B>();
-static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the class 'Class<A>'.
+static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the type 'Class<A>'.
  - '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'.
@@ -969,7 +969,7 @@ static method main() → dynamic {}
 static method test(self::A a) → dynamic {
   self::Class<self::A> classA = new self::Class::•<self::A>();
   self::Class<self::B> classB = new self::Class::•<self::B>();
-  invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+  invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
  - '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'.
@@ -1083,7 +1083,7 @@ Try correcting the name to the name of an existing method, or defining a method
 static method /* from org-dartlang-testcase:///check_bounds_lib.dart */ testInPart(self::A a) → dynamic {
   self::Class<self::A> classA = new self::Class::•<self::A>();
   self::Class<self::B> classB = new self::Class::•<self::B>();
-  invalid-expression "pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+  invalid-expression "pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
  - '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'.
diff --git a/pkg/front_end/testcases/extensions/check_bounds.dart.strong.outline.expect b/pkg/front_end/testcases/extensions/check_bounds.dart.strong.outline.expect
index 7eb5bbd86b2..df014220da7 100644
--- a/pkg/front_end/testcases/extensions/check_bounds.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/extensions/check_bounds.dart.strong.outline.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the class 'Class<A>'.
+// pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the type 'Class<A>'.
 //  - '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'.
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 f7df0c94e67..1c84fb72dfc 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
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the class 'Class<A>'.
+// pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the type 'Class<A>'.
 //  - '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'.
@@ -278,7 +278,7 @@ library;
 // final field29 = Extension<B>(classB).genericMethod<B>(a);
 //                                                       ^
 //
-// pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+// pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
 //  - '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'.
@@ -547,7 +547,7 @@ library;
 //   Extension<B>(classB).genericMethod<B>(a);
 //                                         ^
 //
-// pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+// pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
 //  - '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'.
@@ -844,7 +844,7 @@ extension Extension<T extends self::B> on self::Class<T> {
 static final field self::A a = new self::A::•();
 static final field self::Class<self::A> classA = new self::Class::•<self::A>();
 static final field self::Class<self::B> classB = new self::Class::•<self::B>();
-static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the class 'Class<A>'.
+static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:61:23: Error: The method 'method' isn't defined for the type 'Class<A>'.
  - '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'.
@@ -969,7 +969,7 @@ static method main() → dynamic {}
 static method test(self::A a) → dynamic {
   self::Class<self::A> classA = new self::Class::•<self::A>();
   self::Class<self::B> classB = new self::Class::•<self::B>();
-  invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+  invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:24:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
  - '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'.
@@ -1083,7 +1083,7 @@ Try correcting the name to the name of an existing method, or defining a method
 static method /* from org-dartlang-testcase:///check_bounds_lib.dart */ testInPart(self::A a) → dynamic {
   self::Class<self::A> classA = new self::Class::•<self::A>();
   self::Class<self::B> classB = new self::Class::•<self::B>();
-  invalid-expression "pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the class 'Class<A>'.
+  invalid-expression "pkg/front_end/testcases/extensions/check_bounds_lib.dart:11:10: Error: The method 'method' isn't defined for the type 'Class<A>'.
  - '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'.
diff --git a/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.expect b/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.expect
index 40ce5cd5033..3b468a2bd26 100644
--- a/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.expect
@@ -27,7 +27,7 @@ library;
 //   value = "".noSuchMethod;
 //              ^
 //
-// pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'hashCode'.
 //   "".hashCode = 42;
 //      ^^^^^^^^
@@ -76,7 +76,7 @@ static method errors() → dynamic {
  - 'Invocation' is from 'dart:core'.
   value = \"\".noSuchMethod;
              ^" in "".{core::Object::noSuchMethod}{(core::Invocation) → dynamic} as{TypeError} core::int;
-  invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class 'String'.
+  invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'hashCode'.
   \"\".hashCode = 42;
      ^^^^^^^^" in "".{<unresolved>}hashCode = 42;
diff --git a/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.modular.expect
index 40ce5cd5033..3b468a2bd26 100644
--- a/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.modular.expect
@@ -27,7 +27,7 @@ library;
 //   value = "".noSuchMethod;
 //              ^
 //
-// pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'hashCode'.
 //   "".hashCode = 42;
 //      ^^^^^^^^
@@ -76,7 +76,7 @@ static method errors() → dynamic {
  - 'Invocation' is from 'dart:core'.
   value = \"\".noSuchMethod;
              ^" in "".{core::Object::noSuchMethod}{(core::Invocation) → dynamic} as{TypeError} core::int;
-  invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class 'String'.
+  invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'hashCode'.
   \"\".hashCode = 42;
      ^^^^^^^^" in "".{<unresolved>}hashCode = 42;
diff --git a/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.transformed.expect
index 98b8042e5d2..17604b96dda 100644
--- a/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/conflict_with_object.dart.strong.transformed.expect
@@ -27,7 +27,7 @@ library;
 //   value = "".noSuchMethod;
 //              ^
 //
-// pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'hashCode'.
 //   "".hashCode = 42;
 //      ^^^^^^^^
@@ -76,7 +76,7 @@ static method errors() → dynamic {
  - 'Invocation' is from 'dart:core'.
   value = \"\".noSuchMethod;
              ^" in "".{core::Object::noSuchMethod}{(core::Invocation) → dynamic} as{TypeError} core::int;
-  invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class 'String'.
+  invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'hashCode'.
   \"\".hashCode = 42;
      ^^^^^^^^" in "".{<unresolved>}hashCode = 42;
diff --git a/pkg/front_end/testcases/extensions/conflicts.dart.strong.expect b/pkg/front_end/testcases/extensions/conflicts.dart.strong.expect
index 2f30efed822..9cb1de9382f 100644
--- a/pkg/front_end/testcases/extensions/conflicts.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/conflicts.dart.strong.expect
@@ -16,7 +16,7 @@ library;
 //   duplicateMethodName1() => 1;
 //   ^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the class 'Class2'.
+// pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the type 'Class2'.
 //  - 'Class2' is from 'pkg/front_end/testcases/extensions/conflicts.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'uniqueMethod2'.
 //   c2.uniqueMethod2();
@@ -62,7 +62,7 @@ static method main() → dynamic {
 }
 static method errors() → dynamic {
   self::Class2 c2 = new self::Class2::•();
-  invalid-expression "pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the class 'Class2'.
+  invalid-expression "pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the type 'Class2'.
  - 'Class2' is from 'pkg/front_end/testcases/extensions/conflicts.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'uniqueMethod2'.
   c2.uniqueMethod2();
diff --git a/pkg/front_end/testcases/extensions/conflicts.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/conflicts.dart.strong.modular.expect
index 2f30efed822..9cb1de9382f 100644
--- a/pkg/front_end/testcases/extensions/conflicts.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/conflicts.dart.strong.modular.expect
@@ -16,7 +16,7 @@ library;
 //   duplicateMethodName1() => 1;
 //   ^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the class 'Class2'.
+// pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the type 'Class2'.
 //  - 'Class2' is from 'pkg/front_end/testcases/extensions/conflicts.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'uniqueMethod2'.
 //   c2.uniqueMethod2();
@@ -62,7 +62,7 @@ static method main() → dynamic {
 }
 static method errors() → dynamic {
   self::Class2 c2 = new self::Class2::•();
-  invalid-expression "pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the class 'Class2'.
+  invalid-expression "pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the type 'Class2'.
  - 'Class2' is from 'pkg/front_end/testcases/extensions/conflicts.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'uniqueMethod2'.
   c2.uniqueMethod2();
diff --git a/pkg/front_end/testcases/extensions/conflicts.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/conflicts.dart.strong.transformed.expect
index 2f30efed822..9cb1de9382f 100644
--- a/pkg/front_end/testcases/extensions/conflicts.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/conflicts.dart.strong.transformed.expect
@@ -16,7 +16,7 @@ library;
 //   duplicateMethodName1() => 1;
 //   ^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the class 'Class2'.
+// pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the type 'Class2'.
 //  - 'Class2' is from 'pkg/front_end/testcases/extensions/conflicts.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'uniqueMethod2'.
 //   c2.uniqueMethod2();
@@ -62,7 +62,7 @@ static method main() → dynamic {
 }
 static method errors() → dynamic {
   self::Class2 c2 = new self::Class2::•();
-  invalid-expression "pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the class 'Class2'.
+  invalid-expression "pkg/front_end/testcases/extensions/conflicts.dart:31:6: Error: The method 'uniqueMethod2' isn't defined for the type 'Class2'.
  - 'Class2' is from 'pkg/front_end/testcases/extensions/conflicts.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'uniqueMethod2'.
   c2.uniqueMethod2();
diff --git a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.expect b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.expect
index 5f131a0f47d..45e9791d725 100644
--- a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'm2'.
 //   expect(0, c.m2);
 //               ^^
 //
-// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
 //   c.m1 = 2;
@@ -99,12 +99,12 @@ static method main() → dynamic {
 }
 static method errors() → dynamic {
   self::Class c = new self::Class::•();
-  self::expect(0, invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the class 'Class'.
+  self::expect(0, invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'm2'.
   expect(0, c.m2);
               ^^" in c{<unresolved>}.m2);
-  invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
   c.m1 = 2;
diff --git a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.modular.expect
index 5f131a0f47d..45e9791d725 100644
--- a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.modular.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'm2'.
 //   expect(0, c.m2);
 //               ^^
 //
-// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
 //   c.m1 = 2;
@@ -99,12 +99,12 @@ static method main() → dynamic {
 }
 static method errors() → dynamic {
   self::Class c = new self::Class::•();
-  self::expect(0, invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the class 'Class'.
+  self::expect(0, invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'm2'.
   expect(0, c.m2);
               ^^" in c{<unresolved>}.m2);
-  invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
   c.m1 = 2;
diff --git a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.transformed.expect
index 5f131a0f47d..45e9791d725 100644
--- a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.strong.transformed.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'm2'.
 //   expect(0, c.m2);
 //               ^^
 //
-// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
 //   c.m1 = 2;
@@ -99,12 +99,12 @@ static method main() → dynamic {
 }
 static method errors() → dynamic {
   self::Class c = new self::Class::•();
-  self::expect(0, invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the class 'Class'.
+  self::expect(0, invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:30:15: Error: The getter 'm2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'm2'.
   expect(0, c.m2);
               ^^" in c{<unresolved>}.m2);
-  invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:31:5: Error: The setter 'm1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'm1'.
   c.m1 = 2;
diff --git a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.expect b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.expect
index e10e7967366..48fa5649cd4 100644
--- a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'staticMethod'.
 //   c.staticMethod();
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticMethod'.
 //   c.staticMethod;
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticProperty'.
 //   c.staticProperty;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticProperty'.
 //   c.staticProperty = 42;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticField'.
 //   c.staticField;
 //     ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticField'.
 //   c.staticField = 42;
@@ -66,32 +66,32 @@ static extension-member set Extension1|staticProperty(core::int value) → void
 }
 static method main() → dynamic {
   self::Class1 c = new self::Class1::•();
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'staticMethod'.
   c.staticMethod();
     ^^^^^^^^^^^^" in c{<unresolved>}.staticMethod();
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticMethod'.
   c.staticMethod;
     ^^^^^^^^^^^^" in c{<unresolved>}.staticMethod;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticProperty'.
   c.staticProperty;
     ^^^^^^^^^^^^^^" in c{<unresolved>}.staticProperty;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticProperty'.
   c.staticProperty = 42;
     ^^^^^^^^^^^^^^" in c.{<unresolved>}staticProperty = 42;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticField'.
   c.staticField;
     ^^^^^^^^^^^" in c{<unresolved>}.staticField;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticField'.
   c.staticField = 42;
diff --git a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.modular.expect
index e10e7967366..48fa5649cd4 100644
--- a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.modular.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'staticMethod'.
 //   c.staticMethod();
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticMethod'.
 //   c.staticMethod;
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticProperty'.
 //   c.staticProperty;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticProperty'.
 //   c.staticProperty = 42;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticField'.
 //   c.staticField;
 //     ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticField'.
 //   c.staticField = 42;
@@ -66,32 +66,32 @@ static extension-member set Extension1|staticProperty(core::int value) → void
 }
 static method main() → dynamic {
   self::Class1 c = new self::Class1::•();
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'staticMethod'.
   c.staticMethod();
     ^^^^^^^^^^^^" in c{<unresolved>}.staticMethod();
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticMethod'.
   c.staticMethod;
     ^^^^^^^^^^^^" in c{<unresolved>}.staticMethod;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticProperty'.
   c.staticProperty;
     ^^^^^^^^^^^^^^" in c{<unresolved>}.staticProperty;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticProperty'.
   c.staticProperty = 42;
     ^^^^^^^^^^^^^^" in c.{<unresolved>}staticProperty = 42;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticField'.
   c.staticField;
     ^^^^^^^^^^^" in c{<unresolved>}.staticField;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticField'.
   c.staticField = 42;
diff --git a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.transformed.expect
index e10e7967366..48fa5649cd4 100644
--- a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.strong.transformed.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'staticMethod'.
 //   c.staticMethod();
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticMethod'.
 //   c.staticMethod;
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticProperty'.
 //   c.staticProperty;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticProperty'.
 //   c.staticProperty = 42;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticField'.
 //   c.staticField;
 //     ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticField'.
 //   c.staticField = 42;
@@ -66,32 +66,32 @@ static extension-member set Extension1|staticProperty(core::int value) → void
 }
 static method main() → dynamic {
   self::Class1 c = new self::Class1::•();
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:27:5: Error: The method 'staticMethod' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'staticMethod'.
   c.staticMethod();
     ^^^^^^^^^^^^" in c{<unresolved>}.staticMethod();
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:28:5: Error: The getter 'staticMethod' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticMethod'.
   c.staticMethod;
     ^^^^^^^^^^^^" in c{<unresolved>}.staticMethod;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:29:5: Error: The getter 'staticProperty' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticProperty'.
   c.staticProperty;
     ^^^^^^^^^^^^^^" in c{<unresolved>}.staticProperty;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:30:5: Error: The setter 'staticProperty' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticProperty'.
   c.staticProperty = 42;
     ^^^^^^^^^^^^^^" in c.{<unresolved>}staticProperty = 42;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:31:5: Error: The getter 'staticField' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'staticField'.
   c.staticField;
     ^^^^^^^^^^^" in c{<unresolved>}.staticField;
-  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/extensions/instance_access_of_static.dart:32:5: Error: The setter 'staticField' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/extensions/instance_access_of_static.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticField'.
   c.staticField = 42;
diff --git a/pkg/front_end/testcases/extensions/issue38713.dart.strong.expect b/pkg/front_end/testcases/extensions/issue38713.dart.strong.expect
index e2eeba8dd7a..d069ccedeff 100644
--- a/pkg/front_end/testcases/extensions/issue38713.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/issue38713.dart.strong.expect
@@ -36,7 +36,7 @@ library;
 //   C.property3 = 42;
 //               ^
 //
-// pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property3'.
 //   42.property3;
 //      ^^^^^^^^^
@@ -60,7 +60,7 @@ static method test() → void {
   invalid-expression "pkg/front_end/testcases/extensions/issue38713.dart:16:15: Error: Can't assign to this.
   C.property3 = 42;
               ^";
-  invalid-expression "pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property3'.
   42.property3;
      ^^^^^^^^^" in 42{<unresolved>}.property3;
diff --git a/pkg/front_end/testcases/extensions/issue38713.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/issue38713.dart.strong.modular.expect
index e2eeba8dd7a..d069ccedeff 100644
--- a/pkg/front_end/testcases/extensions/issue38713.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/issue38713.dart.strong.modular.expect
@@ -36,7 +36,7 @@ library;
 //   C.property3 = 42;
 //               ^
 //
-// pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property3'.
 //   42.property3;
 //      ^^^^^^^^^
@@ -60,7 +60,7 @@ static method test() → void {
   invalid-expression "pkg/front_end/testcases/extensions/issue38713.dart:16:15: Error: Can't assign to this.
   C.property3 = 42;
               ^";
-  invalid-expression "pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property3'.
   42.property3;
      ^^^^^^^^^" in 42{<unresolved>}.property3;
diff --git a/pkg/front_end/testcases/extensions/issue38713.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/issue38713.dart.strong.transformed.expect
index e2eeba8dd7a..d069ccedeff 100644
--- a/pkg/front_end/testcases/extensions/issue38713.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue38713.dart.strong.transformed.expect
@@ -36,7 +36,7 @@ library;
 //   C.property3 = 42;
 //               ^
 //
-// pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property3'.
 //   42.property3;
 //      ^^^^^^^^^
@@ -60,7 +60,7 @@ static method test() → void {
   invalid-expression "pkg/front_end/testcases/extensions/issue38713.dart:16:15: Error: Can't assign to this.
   C.property3 = 42;
               ^";
-  invalid-expression "pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38713.dart:17:6: Error: The getter 'property3' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property3'.
   42.property3;
      ^^^^^^^^^" in 42{<unresolved>}.property3;
diff --git a/pkg/front_end/testcases/extensions/issue38745.dart.strong.expect b/pkg/front_end/testcases/extensions/issue38745.dart.strong.expect
index 1435833e238..72481e884ed 100644
--- a/pkg/front_end/testcases/extensions/issue38745.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/issue38745.dart.strong.expect
@@ -72,37 +72,37 @@ library;
 //   ext(c).property2 = 23;
 //          ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
 //   c.field;
 //     ^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'field'.
 //   c.field = 23;
 //     ^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 //   c.property;
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 //   c.property = 23;
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property2'.
 //   c.property2;
 //     ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property2'.
 //   c.property2 = 23;
@@ -153,32 +153,32 @@ static extension-member method ext|get#method<T extends core::Object? = dynamic>
 static method main() → dynamic {}
 static method errors() → dynamic {
   self::C<core::int> c = new self::C::•<core::int>();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
   c.field;
     ^^^^^" in c{<unresolved>}.field;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'field'.
   c.field = 23;
     ^^^^^" in c.{<unresolved>}field = 23;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
   c.property;
     ^^^^^^^^" in c{<unresolved>}.property;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
   c.property = 23;
     ^^^^^^^^" in c.{<unresolved>}property = 23;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property2'.
   c.property2;
     ^^^^^^^^^" in c{<unresolved>}.property2;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property2'.
   c.property2 = 23;
diff --git a/pkg/front_end/testcases/extensions/issue38745.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/issue38745.dart.strong.modular.expect
index 1435833e238..72481e884ed 100644
--- a/pkg/front_end/testcases/extensions/issue38745.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/issue38745.dart.strong.modular.expect
@@ -72,37 +72,37 @@ library;
 //   ext(c).property2 = 23;
 //          ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
 //   c.field;
 //     ^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'field'.
 //   c.field = 23;
 //     ^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 //   c.property;
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 //   c.property = 23;
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property2'.
 //   c.property2;
 //     ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property2'.
 //   c.property2 = 23;
@@ -153,32 +153,32 @@ static extension-member method ext|get#method<T extends core::Object? = dynamic>
 static method main() → dynamic {}
 static method errors() → dynamic {
   self::C<core::int> c = new self::C::•<core::int>();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
   c.field;
     ^^^^^" in c{<unresolved>}.field;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'field'.
   c.field = 23;
     ^^^^^" in c.{<unresolved>}field = 23;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
   c.property;
     ^^^^^^^^" in c{<unresolved>}.property;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
   c.property = 23;
     ^^^^^^^^" in c.{<unresolved>}property = 23;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property2'.
   c.property2;
     ^^^^^^^^^" in c{<unresolved>}.property2;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property2'.
   c.property2 = 23;
diff --git a/pkg/front_end/testcases/extensions/issue38745.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/issue38745.dart.strong.transformed.expect
index 1435833e238..72481e884ed 100644
--- a/pkg/front_end/testcases/extensions/issue38745.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue38745.dart.strong.transformed.expect
@@ -72,37 +72,37 @@ library;
 //   ext(c).property2 = 23;
 //          ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
 //   c.field;
 //     ^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'field'.
 //   c.field = 23;
 //     ^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 //   c.property;
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 //   c.property = 23;
 //     ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property2'.
 //   c.property2;
 //     ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the class 'C<int>'.
+// pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the type 'C<int>'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property2'.
 //   c.property2 = 23;
@@ -153,32 +153,32 @@ static extension-member method ext|get#method<T extends core::Object? = dynamic>
 static method main() → dynamic {}
 static method errors() → dynamic {
   self::C<core::int> c = new self::C::•<core::int>();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:34:5: Error: The getter 'field' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
   c.field;
     ^^^^^" in c{<unresolved>}.field;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:35:5: Error: The setter 'field' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'field'.
   c.field = 23;
     ^^^^^" in c.{<unresolved>}field = 23;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:36:5: Error: The getter 'property' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
   c.property;
     ^^^^^^^^" in c{<unresolved>}.property;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:37:5: Error: The setter 'property' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
   c.property = 23;
     ^^^^^^^^" in c.{<unresolved>}property = 23;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:38:5: Error: The getter 'property2' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property2'.
   c.property2;
     ^^^^^^^^^" in c{<unresolved>}.property2;
-  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the class 'C<int>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:39:5: Error: The setter 'property2' isn't defined for the type 'C<int>'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38745.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property2'.
   c.property2 = 23;
diff --git a/pkg/front_end/testcases/extensions/issue38750.dart.strong.expect b/pkg/front_end/testcases/extensions/issue38750.dart.strong.expect
index 925b46f6f31..4f368085285 100644
--- a/pkg/front_end/testcases/extensions/issue38750.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/issue38750.dart.strong.expect
@@ -6,13 +6,13 @@ library;
 //   C._staticFoo();
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the class 'C'.
+// pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_foo'.
 //   c._foo();
 //     ^^^^
 //
-// pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the class 'C'.
+// pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_bar'.
 //   c._bar();
@@ -27,7 +27,7 @@ import "org-dartlang-testcase:///issue38750_lib2.dart";
 static method main() → dynamic {}
 static method errors() → dynamic {
   iss::C c = new iss::C::•();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_foo'.
   c._foo();
@@ -37,7 +37,7 @@ Try correcting the name to the name of an existing method, or defining a method
     ^^^^^^^^^^";
   c.{iss::C::foo}(){() → dynamic};
   iss::C::staticFoo();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_bar'.
   c._bar();
@@ -87,7 +87,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the class 'C'.
+// pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_bar'.
 //   c._bar();
@@ -100,7 +100,7 @@ import "org-dartlang-testcase:///issue38750_lib1.dart";
 
 static method errors() → dynamic {
   iss::C c = new iss::C::•();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_bar'.
   c._bar();
diff --git a/pkg/front_end/testcases/extensions/issue38750.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/issue38750.dart.strong.modular.expect
index 925b46f6f31..4f368085285 100644
--- a/pkg/front_end/testcases/extensions/issue38750.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/issue38750.dart.strong.modular.expect
@@ -6,13 +6,13 @@ library;
 //   C._staticFoo();
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the class 'C'.
+// pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_foo'.
 //   c._foo();
 //     ^^^^
 //
-// pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the class 'C'.
+// pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_bar'.
 //   c._bar();
@@ -27,7 +27,7 @@ import "org-dartlang-testcase:///issue38750_lib2.dart";
 static method main() → dynamic {}
 static method errors() → dynamic {
   iss::C c = new iss::C::•();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_foo'.
   c._foo();
@@ -37,7 +37,7 @@ Try correcting the name to the name of an existing method, or defining a method
     ^^^^^^^^^^";
   c.{iss::C::foo}(){() → dynamic};
   iss::C::staticFoo();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_bar'.
   c._bar();
@@ -87,7 +87,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the class 'C'.
+// pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_bar'.
 //   c._bar();
@@ -100,7 +100,7 @@ import "org-dartlang-testcase:///issue38750_lib1.dart";
 
 static method errors() → dynamic {
   iss::C c = new iss::C::•();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_bar'.
   c._bar();
diff --git a/pkg/front_end/testcases/extensions/issue38750.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/issue38750.dart.strong.transformed.expect
index 925b46f6f31..4f368085285 100644
--- a/pkg/front_end/testcases/extensions/issue38750.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue38750.dart.strong.transformed.expect
@@ -6,13 +6,13 @@ library;
 //   C._staticFoo();
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the class 'C'.
+// pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_foo'.
 //   c._foo();
 //     ^^^^
 //
-// pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the class 'C'.
+// pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_bar'.
 //   c._bar();
@@ -27,7 +27,7 @@ import "org-dartlang-testcase:///issue38750_lib2.dart";
 static method main() → dynamic {}
 static method errors() → dynamic {
   iss::C c = new iss::C::•();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:12:5: Error: The method '_foo' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_foo'.
   c._foo();
@@ -37,7 +37,7 @@ Try correcting the name to the name of an existing method, or defining a method
     ^^^^^^^^^^";
   c.{iss::C::foo}(){() → dynamic};
   iss::C::staticFoo();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38750.dart:16:5: Error: The method '_bar' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_bar'.
   c._bar();
@@ -87,7 +87,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the class 'C'.
+// pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_bar'.
 //   c._bar();
@@ -100,7 +100,7 @@ import "org-dartlang-testcase:///issue38750_lib1.dart";
 
 static method errors() → dynamic {
   iss::C c = new iss::C::•();
-  invalid-expression "pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue38750_lib2.dart:9:5: Error: The method '_bar' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/extensions/issue38750_lib1.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_bar'.
   c._bar();
diff --git a/pkg/front_end/testcases/extensions/issue43218.dart.strong.expect b/pkg/front_end/testcases/extensions/issue43218.dart.strong.expect
index e446b4fdf5e..4eb7a821ca3 100644
--- a/pkg/front_end/testcases/extensions/issue43218.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/issue43218.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'id'.
 //   Ext(c).id++;
 //          ^^
@@ -30,7 +30,7 @@ static extension-member method Ext|get#id(lowered final self::C #this) → core:
   return #this.{self::C::value}{core::int}.{core::num::+}(1){(core::num) → core::int};
 static method test() → dynamic {
   self::C c = new self::C::•();
-  let final self::C #t1 = c in invalid-expression "pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the class 'int'.
+  let final self::C #t1 = c in invalid-expression "pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'id'.
   Ext(c).id++;
          ^^" in #t1.{<unresolved>}id = self::Ext|get#id(#t1).{core::num::+}(1){(core::num) → core::int};
diff --git a/pkg/front_end/testcases/extensions/issue43218.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/issue43218.dart.strong.modular.expect
index e446b4fdf5e..4eb7a821ca3 100644
--- a/pkg/front_end/testcases/extensions/issue43218.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/issue43218.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'id'.
 //   Ext(c).id++;
 //          ^^
@@ -30,7 +30,7 @@ static extension-member method Ext|get#id(lowered final self::C #this) → core:
   return #this.{self::C::value}{core::int}.{core::num::+}(1){(core::num) → core::int};
 static method test() → dynamic {
   self::C c = new self::C::•();
-  let final self::C #t1 = c in invalid-expression "pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the class 'int'.
+  let final self::C #t1 = c in invalid-expression "pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'id'.
   Ext(c).id++;
          ^^" in #t1.{<unresolved>}id = self::Ext|get#id(#t1).{core::num::+}(1){(core::num) → core::int};
diff --git a/pkg/front_end/testcases/extensions/issue43218.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/issue43218.dart.strong.transformed.expect
index e446b4fdf5e..4eb7a821ca3 100644
--- a/pkg/front_end/testcases/extensions/issue43218.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue43218.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'id'.
 //   Ext(c).id++;
 //          ^^
@@ -30,7 +30,7 @@ static extension-member method Ext|get#id(lowered final self::C #this) → core:
   return #this.{self::C::value}{core::int}.{core::num::+}(1){(core::num) → core::int};
 static method test() → dynamic {
   self::C c = new self::C::•();
-  let final self::C #t1 = c in invalid-expression "pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the class 'int'.
+  let final self::C #t1 = c in invalid-expression "pkg/front_end/testcases/extensions/issue43218.dart:24:10: Error: The setter 'id' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'id'.
   Ext(c).id++;
          ^^" in #t1.{<unresolved>}id = self::Ext|get#id(#t1).{core::num::+}(1){(core::num) → core::int};
diff --git a/pkg/front_end/testcases/extensions/issue44003.dart.strong.expect b/pkg/front_end/testcases/extensions/issue44003.dart.strong.expect
index 59839d3e9a1..32a8131ef45 100644
--- a/pkg/front_end/testcases/extensions/issue44003.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/issue44003.dart.strong.expect
@@ -9,7 +9,7 @@ library;
 //   void foo(String bar) {
 //        ^^^
 //
-// pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the class 'List<String>'.
+// pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the type 'List<String>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   args.foo('1', 2);
@@ -23,7 +23,7 @@ extension /* unnamed */ _extension#0 on core::List<core::String> {
   method tearoff foo = self::_extension#0|get#foo;
 }
 static method test(core::List<core::String> args) → void {
-  invalid-expression "pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the class 'List<String>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the type 'List<String>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   args.foo('1', 2);
diff --git a/pkg/front_end/testcases/extensions/issue44003.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/issue44003.dart.strong.modular.expect
index 59839d3e9a1..32a8131ef45 100644
--- a/pkg/front_end/testcases/extensions/issue44003.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/issue44003.dart.strong.modular.expect
@@ -9,7 +9,7 @@ library;
 //   void foo(String bar) {
 //        ^^^
 //
-// pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the class 'List<String>'.
+// pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the type 'List<String>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   args.foo('1', 2);
@@ -23,7 +23,7 @@ extension /* unnamed */ _extension#0 on core::List<core::String> {
   method tearoff foo = self::_extension#0|get#foo;
 }
 static method test(core::List<core::String> args) → void {
-  invalid-expression "pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the class 'List<String>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the type 'List<String>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   args.foo('1', 2);
diff --git a/pkg/front_end/testcases/extensions/issue44003.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/issue44003.dart.strong.transformed.expect
index 59839d3e9a1..32a8131ef45 100644
--- a/pkg/front_end/testcases/extensions/issue44003.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue44003.dart.strong.transformed.expect
@@ -9,7 +9,7 @@ library;
 //   void foo(String bar) {
 //        ^^^
 //
-// pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the class 'List<String>'.
+// pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the type 'List<String>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   args.foo('1', 2);
@@ -23,7 +23,7 @@ extension /* unnamed */ _extension#0 on core::List<core::String> {
   method tearoff foo = self::_extension#0|get#foo;
 }
 static method test(core::List<core::String> args) → void {
-  invalid-expression "pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the class 'List<String>'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue44003.dart:6:8: Error: The method 'foo' isn't defined for the type 'List<String>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   args.foo('1', 2);
diff --git a/pkg/front_end/testcases/extensions/issue44844.dart.strong.expect b/pkg/front_end/testcases/extensions/issue44844.dart.strong.expect
index e03e2f0c761..abb923261d9 100644
--- a/pkg/front_end/testcases/extensions/issue44844.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/issue44844.dart.strong.expect
@@ -9,7 +9,7 @@ library;
 //   static int foo = 2;
 //              ^^^
 //
-// pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   3.foo();
 //     ^^^
@@ -22,7 +22,7 @@ extension /* unnamed */ _extension#0 on core::int {
 }
 static field core::int _extension#0|foo = 2;
 static method test() → void {
-  invalid-expression "pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   3.foo();
     ^^^" in 3{<unresolved>}.foo();
diff --git a/pkg/front_end/testcases/extensions/issue44844.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/issue44844.dart.strong.modular.expect
index e03e2f0c761..abb923261d9 100644
--- a/pkg/front_end/testcases/extensions/issue44844.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/issue44844.dart.strong.modular.expect
@@ -9,7 +9,7 @@ library;
 //   static int foo = 2;
 //              ^^^
 //
-// pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   3.foo();
 //     ^^^
@@ -22,7 +22,7 @@ extension /* unnamed */ _extension#0 on core::int {
 }
 static field core::int _extension#0|foo = 2;
 static method test() → void {
-  invalid-expression "pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   3.foo();
     ^^^" in 3{<unresolved>}.foo();
diff --git a/pkg/front_end/testcases/extensions/issue44844.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/issue44844.dart.strong.transformed.expect
index e03e2f0c761..abb923261d9 100644
--- a/pkg/front_end/testcases/extensions/issue44844.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue44844.dart.strong.transformed.expect
@@ -9,7 +9,7 @@ library;
 //   static int foo = 2;
 //              ^^^
 //
-// pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   3.foo();
 //     ^^^
@@ -22,7 +22,7 @@ extension /* unnamed */ _extension#0 on core::int {
 }
 static field core::int _extension#0|foo = 2;
 static method test() → void {
-  invalid-expression "pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/extensions/issue44844.dart:11:5: Error: The method 'foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   3.foo();
     ^^^" in 3{<unresolved>}.foo();
diff --git a/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.expect b/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.expect
index 8f09934449c..d541ed49d56 100644
--- a/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 // var missingGetter = c.setter += 42;
@@ -20,7 +20,7 @@ extension Extension on self::Class {
   set setter = self::Extension|set#setter;
 }
 static field self::Class c = new self::Class::•();
-static field dynamic missingGetter = let final self::Class #t1 = self::c in let final dynamic #t2 = invalid-expression "pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the class 'Class'.
+static field dynamic missingGetter = let final self::Class #t1 = self::c in let final dynamic #t2 = invalid-expression "pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/missing_toplevel.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 var missingGetter = c.setter += 42;
diff --git a/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.modular.expect
index 8f09934449c..d541ed49d56 100644
--- a/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 // var missingGetter = c.setter += 42;
@@ -20,7 +20,7 @@ extension Extension on self::Class {
   set setter = self::Extension|set#setter;
 }
 static field self::Class c = new self::Class::•();
-static field dynamic missingGetter = let final self::Class #t1 = self::c in let final dynamic #t2 = invalid-expression "pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the class 'Class'.
+static field dynamic missingGetter = let final self::Class #t1 = self::c in let final dynamic #t2 = invalid-expression "pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/missing_toplevel.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 var missingGetter = c.setter += 42;
diff --git a/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.outline.expect b/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.outline.expect
index 9971d7c64e0..dac7b08e97b 100644
--- a/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.outline.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 // var missingGetter = c.setter += 42;
diff --git a/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.transformed.expect
index 8f09934449c..d541ed49d56 100644
--- a/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/missing_toplevel.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 // var missingGetter = c.setter += 42;
@@ -20,7 +20,7 @@ extension Extension on self::Class {
   set setter = self::Extension|set#setter;
 }
 static field self::Class c = new self::Class::•();
-static field dynamic missingGetter = let final self::Class #t1 = self::c in let final dynamic #t2 = invalid-expression "pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the class 'Class'.
+static field dynamic missingGetter = let final self::Class #t1 = self::c in let final dynamic #t2 = invalid-expression "pkg/front_end/testcases/extensions/missing_toplevel.dart:13:23: Error: The getter 'setter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/missing_toplevel.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'setter'.
 var missingGetter = c.setter += 42;
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.expect
index fadfdeae826..178239058b4 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.expect
@@ -33,7 +33,7 @@ library;
 //   nonStruct.method(); // error
 //   ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
 //   nonStruct.method(); // error
@@ -47,31 +47,31 @@ library;
 //   nonStruct.property = nonStruct.property; // error
 //                        ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 //   nonStruct.property = nonStruct.property; // error
 //                                  ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 //   nonStruct.property = nonStruct.property; // error
 //             ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
 //   new NonStruct().method(); // error
 //                   ^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 //   new NonStruct().property; // error
 //                   ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 //   new NonStruct().property = null; // error
@@ -164,37 +164,37 @@ static method errors() → dynamic {
 }
 static method testNonStruct() → dynamic {
   self::NonStruct nonStruct;
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
   nonStruct.method(); // error
             ^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:3: Error: Non-nullable variable 'nonStruct' must be assigned before it can be used.
   nonStruct.method(); // error
   ^^^^^^^^^" in nonStruct{<unresolved>}.method();
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
   nonStruct.property = nonStruct.property; // error
             ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:3: Error: Non-nullable variable 'nonStruct' must be assigned before it can be used.
   nonStruct.property = nonStruct.property; // error
-  ^^^^^^^^^" in nonStruct.{<unresolved>}property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+  ^^^^^^^^^" in nonStruct.{<unresolved>}property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
   nonStruct.property = nonStruct.property; // error
                                  ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:24: Error: Non-nullable variable 'nonStruct' must be assigned before it can be used.
   nonStruct.property = nonStruct.property; // error
                        ^^^^^^^^^" in nonStruct{<unresolved>}.property;
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
   new NonStruct().method(); // error
                   ^^^^^^" in new self::NonStruct::•(){<unresolved>}.method();
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
   new NonStruct().property; // error
                   ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property;
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
   new NonStruct().property = null; // error
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.modular.expect
index fadfdeae826..178239058b4 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.modular.expect
@@ -33,7 +33,7 @@ library;
 //   nonStruct.method(); // error
 //   ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
 //   nonStruct.method(); // error
@@ -47,31 +47,31 @@ library;
 //   nonStruct.property = nonStruct.property; // error
 //                        ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 //   nonStruct.property = nonStruct.property; // error
 //                                  ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 //   nonStruct.property = nonStruct.property; // error
 //             ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
 //   new NonStruct().method(); // error
 //                   ^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 //   new NonStruct().property; // error
 //                   ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 //   new NonStruct().property = null; // error
@@ -164,37 +164,37 @@ static method errors() → dynamic {
 }
 static method testNonStruct() → dynamic {
   self::NonStruct nonStruct;
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
   nonStruct.method(); // error
             ^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:3: Error: Non-nullable variable 'nonStruct' must be assigned before it can be used.
   nonStruct.method(); // error
   ^^^^^^^^^" in nonStruct{<unresolved>}.method();
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
   nonStruct.property = nonStruct.property; // error
             ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:3: Error: Non-nullable variable 'nonStruct' must be assigned before it can be used.
   nonStruct.property = nonStruct.property; // error
-  ^^^^^^^^^" in nonStruct.{<unresolved>}property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+  ^^^^^^^^^" in nonStruct.{<unresolved>}property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
   nonStruct.property = nonStruct.property; // error
                                  ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:24: Error: Non-nullable variable 'nonStruct' must be assigned before it can be used.
   nonStruct.property = nonStruct.property; // error
                        ^^^^^^^^^" in nonStruct{<unresolved>}.property;
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
   new NonStruct().method(); // error
                   ^^^^^^" in new self::NonStruct::•(){<unresolved>}.method();
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
   new NonStruct().property; // error
                   ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property;
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
   new NonStruct().property = null; // error
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.transformed.expect
index 2aca235ad37..baebaedb80b 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.strong.transformed.expect
@@ -33,7 +33,7 @@ library;
 //   nonStruct.method(); // error
 //   ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
 //   nonStruct.method(); // error
@@ -47,31 +47,31 @@ library;
 //   nonStruct.property = nonStruct.property; // error
 //                        ^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 //   nonStruct.property = nonStruct.property; // error
 //                                  ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 //   nonStruct.property = nonStruct.property; // error
 //             ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
 //   new NonStruct().method(); // error
 //                   ^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 //   new NonStruct().property; // error
 //                   ^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+// pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the type 'NonStruct'.
 //  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 //   new NonStruct().property = null; // error
@@ -164,37 +164,37 @@ static method errors() → dynamic {
 }
 static method testNonStruct() → dynamic {
   self::NonStruct nonStruct;
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:13: Error: The method 'method' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
   nonStruct.method(); // error
             ^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:59:3: Error: Non-nullable variable 'nonStruct' must be assigned before it can be used.
   nonStruct.method(); // error
   ^^^^^^^^^" in nonStruct{<unresolved>}.method();
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:13: Error: The setter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
   nonStruct.property = nonStruct.property; // error
             ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:3: Error: Non-nullable variable 'nonStruct' must be assigned before it can be used.
   nonStruct.property = nonStruct.property; // error
-  ^^^^^^^^^" in nonStruct.{<unresolved>}property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+  ^^^^^^^^^" in nonStruct.{<unresolved>}property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:34: Error: The getter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
   nonStruct.property = nonStruct.property; // error
                                  ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:60:24: Error: Non-nullable variable 'nonStruct' must be assigned before it can be used.
   nonStruct.property = nonStruct.property; // error
                        ^^^^^^^^^" in nonStruct{<unresolved>}.property;
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:61:19: Error: The method 'method' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
   new NonStruct().method(); // error
                   ^^^^^^" in new self::NonStruct::•(){<unresolved>}.method();
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:62:19: Error: The getter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
   new NonStruct().property; // error
                   ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property;
-  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the class 'NonStruct'.
+  invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:63:19: Error: The setter 'property' isn't defined for the type 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
   new NonStruct().property = null; // error
diff --git a/pkg/front_end/testcases/extensions/private_members.dart.strong.expect b/pkg/front_end/testcases/extensions/private_members.dart.strong.expect
index 25a325b3208..5149dc7b0e0 100644
--- a/pkg/front_end/testcases/extensions/private_members.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/private_members.dart.strong.expect
@@ -26,27 +26,27 @@ library;
 //   expect(732, PublicExtension._privateStaticMethod2());
 //                               ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'publicMethod1'.
 //   expect(42, "".publicMethod1());
 //                 ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod1'.
 //   expect(87, ""._privateMethod1());
 //                 ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod2'.
 //   expect(237, ""._privateMethod2());
 //                  ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'publicMethod3'.
 //   expect(473, "".publicMethod3());
 //                  ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod3'.
 //   expect(586, ""._privateMethod3());
 //                  ^^^^^^^^^^^^^^^
@@ -63,23 +63,23 @@ static method main() → dynamic {
   pri::expect(321, pri::PublicExtension|publicStaticMethod2());
 }
 static method errors() → dynamic {
-  pri::expect(42, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the class 'String'.
+  pri::expect(42, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'publicMethod1'.
   expect(42, \"\".publicMethod1());
                 ^^^^^^^^^^^^^" in ""{<unresolved>}.publicMethod1());
-  pri::expect(87, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the class 'String'.
+  pri::expect(87, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod1'.
   expect(87, \"\"._privateMethod1());
                 ^^^^^^^^^^^^^^^" in ""{<unresolved>}._privateMethod1());
-  pri::expect(237, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the class 'String'.
+  pri::expect(237, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod2'.
   expect(237, \"\"._privateMethod2());
                  ^^^^^^^^^^^^^^^" in ""{<unresolved>}._privateMethod2());
-  pri::expect(473, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the class 'String'.
+  pri::expect(473, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'publicMethod3'.
   expect(473, \"\".publicMethod3());
                  ^^^^^^^^^^^^^" in ""{<unresolved>}.publicMethod3());
-  pri::expect(586, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the class 'String'.
+  pri::expect(586, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod3'.
   expect(586, \"\"._privateMethod3());
                  ^^^^^^^^^^^^^^^" in ""{<unresolved>}._privateMethod3());
diff --git a/pkg/front_end/testcases/extensions/private_members.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/private_members.dart.strong.modular.expect
index 25a325b3208..5149dc7b0e0 100644
--- a/pkg/front_end/testcases/extensions/private_members.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/private_members.dart.strong.modular.expect
@@ -26,27 +26,27 @@ library;
 //   expect(732, PublicExtension._privateStaticMethod2());
 //                               ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'publicMethod1'.
 //   expect(42, "".publicMethod1());
 //                 ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod1'.
 //   expect(87, ""._privateMethod1());
 //                 ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod2'.
 //   expect(237, ""._privateMethod2());
 //                  ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'publicMethod3'.
 //   expect(473, "".publicMethod3());
 //                  ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod3'.
 //   expect(586, ""._privateMethod3());
 //                  ^^^^^^^^^^^^^^^
@@ -63,23 +63,23 @@ static method main() → dynamic {
   pri::expect(321, pri::PublicExtension|publicStaticMethod2());
 }
 static method errors() → dynamic {
-  pri::expect(42, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the class 'String'.
+  pri::expect(42, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'publicMethod1'.
   expect(42, \"\".publicMethod1());
                 ^^^^^^^^^^^^^" in ""{<unresolved>}.publicMethod1());
-  pri::expect(87, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the class 'String'.
+  pri::expect(87, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod1'.
   expect(87, \"\"._privateMethod1());
                 ^^^^^^^^^^^^^^^" in ""{<unresolved>}._privateMethod1());
-  pri::expect(237, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the class 'String'.
+  pri::expect(237, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod2'.
   expect(237, \"\"._privateMethod2());
                  ^^^^^^^^^^^^^^^" in ""{<unresolved>}._privateMethod2());
-  pri::expect(473, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the class 'String'.
+  pri::expect(473, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'publicMethod3'.
   expect(473, \"\".publicMethod3());
                  ^^^^^^^^^^^^^" in ""{<unresolved>}.publicMethod3());
-  pri::expect(586, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the class 'String'.
+  pri::expect(586, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod3'.
   expect(586, \"\"._privateMethod3());
                  ^^^^^^^^^^^^^^^" in ""{<unresolved>}._privateMethod3());
diff --git a/pkg/front_end/testcases/extensions/private_members.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/private_members.dart.strong.transformed.expect
index 25a325b3208..5149dc7b0e0 100644
--- a/pkg/front_end/testcases/extensions/private_members.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/private_members.dart.strong.transformed.expect
@@ -26,27 +26,27 @@ library;
 //   expect(732, PublicExtension._privateStaticMethod2());
 //                               ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'publicMethod1'.
 //   expect(42, "".publicMethod1());
 //                 ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod1'.
 //   expect(87, ""._privateMethod1());
 //                 ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod2'.
 //   expect(237, ""._privateMethod2());
 //                  ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named 'publicMethod3'.
 //   expect(473, "".publicMethod3());
 //                  ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the class 'String'.
+// pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod3'.
 //   expect(586, ""._privateMethod3());
 //                  ^^^^^^^^^^^^^^^
@@ -63,23 +63,23 @@ static method main() → dynamic {
   pri::expect(321, pri::PublicExtension|publicStaticMethod2());
 }
 static method errors() → dynamic {
-  pri::expect(42, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the class 'String'.
+  pri::expect(42, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:17:17: Error: The method 'publicMethod1' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'publicMethod1'.
   expect(42, \"\".publicMethod1());
                 ^^^^^^^^^^^^^" in ""{<unresolved>}.publicMethod1());
-  pri::expect(87, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the class 'String'.
+  pri::expect(87, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:18:17: Error: The method '_privateMethod1' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod1'.
   expect(87, \"\"._privateMethod1());
                 ^^^^^^^^^^^^^^^" in ""{<unresolved>}._privateMethod1());
-  pri::expect(237, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the class 'String'.
+  pri::expect(237, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:19:18: Error: The method '_privateMethod2' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod2'.
   expect(237, \"\"._privateMethod2());
                  ^^^^^^^^^^^^^^^" in ""{<unresolved>}._privateMethod2());
-  pri::expect(473, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the class 'String'.
+  pri::expect(473, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:20:18: Error: The method 'publicMethod3' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named 'publicMethod3'.
   expect(473, \"\".publicMethod3());
                  ^^^^^^^^^^^^^" in ""{<unresolved>}.publicMethod3());
-  pri::expect(586, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the class 'String'.
+  pri::expect(586, invalid-expression "pkg/front_end/testcases/extensions/private_members.dart:21:18: Error: The method '_privateMethod3' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod3'.
   expect(586, \"\"._privateMethod3());
                  ^^^^^^^^^^^^^^^" in ""{<unresolved>}._privateMethod3());
diff --git a/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.expect b/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.expect
index d04202a5390..f02f830c811 100644
--- a/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+// pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
 //  - 'SubClass' is from 'pkg/front_end/testcases/extensions/type_variable_bound.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method2'.
 //     SubClass subClass = t3.method2() as SubClass; // error
@@ -50,7 +50,7 @@ static method test2<T extends self::Class>(self::test2::T t2) → dynamic {
 }
 static method test3<T extends core::Object? = dynamic>(self::test3::T% t3) → dynamic {
   if(t3 is self::SubClass) {
-    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
  - 'SubClass' is from 'pkg/front_end/testcases/extensions/type_variable_bound.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method2'.
     SubClass subClass = t3.method2() as SubClass; // error
diff --git a/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.modular.expect b/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.modular.expect
index d04202a5390..f02f830c811 100644
--- a/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+// pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
 //  - 'SubClass' is from 'pkg/front_end/testcases/extensions/type_variable_bound.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method2'.
 //     SubClass subClass = t3.method2() as SubClass; // error
@@ -50,7 +50,7 @@ static method test2<T extends self::Class>(self::test2::T t2) → dynamic {
 }
 static method test3<T extends core::Object? = dynamic>(self::test3::T% t3) → dynamic {
   if(t3 is self::SubClass) {
-    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
  - 'SubClass' is from 'pkg/front_end/testcases/extensions/type_variable_bound.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method2'.
     SubClass subClass = t3.method2() as SubClass; // error
diff --git a/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.transformed.expect
index 4b7dd4bdb49..123cb0293ff 100644
--- a/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/type_variable_bound.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+// pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
 //  - 'SubClass' is from 'pkg/front_end/testcases/extensions/type_variable_bound.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method2'.
 //     SubClass subClass = t3.method2() as SubClass; // error
@@ -50,7 +50,7 @@ static method test2<T extends self::Class>(self::test2::T t2) → dynamic {
 }
 static method test3<T extends core::Object? = dynamic>(self::test3::T% t3) → dynamic {
   if(t3 is self::SubClass) {
-    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/extensions/type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
  - 'SubClass' is from 'pkg/front_end/testcases/extensions/type_variable_bound.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method2'.
     SubClass subClass = t3.method2() as SubClass; // error
diff --git a/pkg/front_end/testcases/general/accessors.dart.strong.expect b/pkg/front_end/testcases/general/accessors.dart.strong.expect
index 21c3bda8f2e..32456f72de3 100644
--- a/pkg/front_end/testcases/general/accessors.dart.strong.expect
+++ b/pkg/front_end/testcases/general/accessors.dart.strong.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
 //       print(onlySetter);
 //             ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
 //     print(onlySetter);
@@ -30,7 +30,7 @@ class C extends core::Object {
   }
   method testC() → dynamic {
     try {
-      core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+      core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
       print(onlySetter);
@@ -43,7 +43,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     this.{self::C::onlySetter} = "hest";
   }
   method testD() → dynamic {
-    core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+    core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
     print(onlySetter);
diff --git a/pkg/front_end/testcases/general/accessors.dart.strong.modular.expect b/pkg/front_end/testcases/general/accessors.dart.strong.modular.expect
index 21c3bda8f2e..32456f72de3 100644
--- a/pkg/front_end/testcases/general/accessors.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/accessors.dart.strong.modular.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
 //       print(onlySetter);
 //             ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
 //     print(onlySetter);
@@ -30,7 +30,7 @@ class C extends core::Object {
   }
   method testC() → dynamic {
     try {
-      core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+      core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
       print(onlySetter);
@@ -43,7 +43,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     this.{self::C::onlySetter} = "hest";
   }
   method testD() → dynamic {
-    core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+    core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
     print(onlySetter);
diff --git a/pkg/front_end/testcases/general/accessors.dart.strong.transformed.expect b/pkg/front_end/testcases/general/accessors.dart.strong.transformed.expect
index 21c3bda8f2e..32456f72de3 100644
--- a/pkg/front_end/testcases/general/accessors.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/accessors.dart.strong.transformed.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
 //       print(onlySetter);
 //             ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
 //     print(onlySetter);
@@ -30,7 +30,7 @@ class C extends core::Object {
   }
   method testC() → dynamic {
     try {
-      core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+      core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:16:13: Error: The getter 'onlySetter' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
       print(onlySetter);
@@ -43,7 +43,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     this.{self::C::onlySetter} = "hest";
   }
   method testD() → dynamic {
-    core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the class 'C'.
+    core::print(invalid-expression "pkg/front_end/testcases/general/accessors.dart:25:11: Error: The getter 'onlySetter' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/accessors.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
     print(onlySetter);
diff --git a/pkg/front_end/testcases/general/bug21938.dart.strong.expect b/pkg/front_end/testcases/general/bug21938.dart.strong.expect
index a7594fa60c9..8f7ebdedfbd 100644
--- a/pkg/front_end/testcases/general/bug21938.dart.strong.expect
+++ b/pkg/front_end/testcases/general/bug21938.dart.strong.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x();
 //    ^
 //
-// pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x(3);
 //    ^
 //
-// pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x.call();
@@ -24,18 +24,18 @@ import self as self;
 import "dart:core" as core;
 
 static method test(core::Object x, core::Function f) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the class 'Object'.
+  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x();
    ^" in x{<unresolved>}.call();
-  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the class 'Object'.
+  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x(3);
    ^" in x{<unresolved>}.call(3);
   f(5, 2);
-  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the class 'Object'.
+  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x.call();
diff --git a/pkg/front_end/testcases/general/bug21938.dart.strong.modular.expect b/pkg/front_end/testcases/general/bug21938.dart.strong.modular.expect
index a7594fa60c9..8f7ebdedfbd 100644
--- a/pkg/front_end/testcases/general/bug21938.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/bug21938.dart.strong.modular.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x();
 //    ^
 //
-// pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x(3);
 //    ^
 //
-// pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x.call();
@@ -24,18 +24,18 @@ import self as self;
 import "dart:core" as core;
 
 static method test(core::Object x, core::Function f) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the class 'Object'.
+  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x();
    ^" in x{<unresolved>}.call();
-  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the class 'Object'.
+  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x(3);
    ^" in x{<unresolved>}.call(3);
   f(5, 2);
-  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the class 'Object'.
+  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x.call();
diff --git a/pkg/front_end/testcases/general/bug21938.dart.strong.transformed.expect b/pkg/front_end/testcases/general/bug21938.dart.strong.transformed.expect
index a9fbfdcf579..02a755f6494 100644
--- a/pkg/front_end/testcases/general/bug21938.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/bug21938.dart.strong.transformed.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x();
 //    ^
 //
-// pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x(3);
 //    ^
 //
-// pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x.call();
@@ -24,18 +24,18 @@ import self as self;
 import "dart:core" as core;
 
 static method test(core::Object x, core::Function f) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the class 'Object'.
+  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:6:4: Error: The method 'call' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x();
    ^" in x{<unresolved>}.call();
-  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the class 'Object'.
+  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:7:4: Error: The method 'call' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x(3);
    ^" in x{<unresolved>}.call(3);
   f(5, 2);
-  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the class 'Object'.
+  invalid-expression "pkg/front_end/testcases/general/bug21938.dart:9:5: Error: The method 'call' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x.call();
diff --git a/pkg/front_end/testcases/general/cascade.dart.strong.expect b/pkg/front_end/testcases/general/cascade.dart.strong.expect
index ed77a4725d3..cf69e964485 100644
--- a/pkg/front_end/testcases/general/cascade.dart.strong.expect
+++ b/pkg/front_end/testcases/general/cascade.dart.strong.expect
@@ -7,17 +7,17 @@ library;
 //     [1]
 //     ^
 //
-// pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
 //     ..first.last.toString()
 //             ^^^^
 //
-// pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the type 'int'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //     ..first[0].toString()
 //            ^
 //
-// pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
 //     ..[0].last.toString();
 //           ^^^^
@@ -48,15 +48,15 @@ static method main() → dynamic {
  - 'List' is from 'dart:core'.
     [1]
     ^" in <core::int>[1] as{TypeError} core::int] in block {
-    invalid-expression "pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
     ..first.last.toString()
             ^^^^" in #t4.{core::Iterable::first}{core::int}{<unresolved>}.last.{core::Object::toString}{<object>}.(){() → core::String};
-    invalid-expression "pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the type 'int'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
     ..first[0].toString()
            ^" in #t4.{core::Iterable::first}{core::int}{<unresolved>}.[](0).{core::Object::toString}{<object>}.(){() → core::String};
-    invalid-expression "pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
     ..[0].last.toString();
           ^^^^" in #t4.{core::List::[]}(0){(core::int) → core::int}{<unresolved>}.last.{core::Object::toString}{<object>}.(){() → core::String};
diff --git a/pkg/front_end/testcases/general/cascade.dart.strong.modular.expect b/pkg/front_end/testcases/general/cascade.dart.strong.modular.expect
index ed77a4725d3..cf69e964485 100644
--- a/pkg/front_end/testcases/general/cascade.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/cascade.dart.strong.modular.expect
@@ -7,17 +7,17 @@ library;
 //     [1]
 //     ^
 //
-// pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
 //     ..first.last.toString()
 //             ^^^^
 //
-// pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the type 'int'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //     ..first[0].toString()
 //            ^
 //
-// pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
 //     ..[0].last.toString();
 //           ^^^^
@@ -48,15 +48,15 @@ static method main() → dynamic {
  - 'List' is from 'dart:core'.
     [1]
     ^" in <core::int>[1] as{TypeError} core::int] in block {
-    invalid-expression "pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
     ..first.last.toString()
             ^^^^" in #t4.{core::Iterable::first}{core::int}{<unresolved>}.last.{core::Object::toString}{<object>}.(){() → core::String};
-    invalid-expression "pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the type 'int'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
     ..first[0].toString()
            ^" in #t4.{core::Iterable::first}{core::int}{<unresolved>}.[](0).{core::Object::toString}{<object>}.(){() → core::String};
-    invalid-expression "pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
     ..[0].last.toString();
           ^^^^" in #t4.{core::List::[]}(0){(core::int) → core::int}{<unresolved>}.last.{core::Object::toString}{<object>}.(){() → core::String};
diff --git a/pkg/front_end/testcases/general/cascade.dart.strong.transformed.expect b/pkg/front_end/testcases/general/cascade.dart.strong.transformed.expect
index 0bff5e2b142..009d02f07f2 100644
--- a/pkg/front_end/testcases/general/cascade.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/cascade.dart.strong.transformed.expect
@@ -7,17 +7,17 @@ library;
 //     [1]
 //     ^
 //
-// pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
 //     ..first.last.toString()
 //             ^^^^
 //
-// pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the type 'int'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //     ..first[0].toString()
 //            ^
 //
-// pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
 //     ..[0].last.toString();
 //           ^^^^
@@ -48,15 +48,15 @@ static method main() → dynamic {
  - 'List' is from 'dart:core'.
     [1]
     ^" in core::_GrowableList::_literal1<core::int>(1) as{TypeError} core::int) in block {
-    invalid-expression "pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/cascade.dart:28:13: Error: The getter 'last' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
     ..first.last.toString()
             ^^^^" in #t4.{core::Iterable::first}{core::int}{<unresolved>}.last.{core::Object::toString}{<object>}.(){() → core::String};
-    invalid-expression "pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/cascade.dart:29:12: Error: The operator '[]' isn't defined for the type 'int'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
     ..first[0].toString()
            ^" in #t4.{core::Iterable::first}{core::int}{<unresolved>}.[](0).{core::Object::toString}{<object>}.(){() → core::String};
-    invalid-expression "pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/cascade.dart:30:11: Error: The getter 'last' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
     ..[0].last.toString();
           ^^^^" in #t4.{core::List::[]}(0){(core::int) → core::int}{<unresolved>}.last.{core::Object::toString}{<object>}.(){() → core::String};
diff --git a/pkg/front_end/testcases/general/conditional_import.dart.strong.expect b/pkg/front_end/testcases/general/conditional_import.dart.strong.expect
index 1b531b4123f..9fbb5ea31a9 100644
--- a/pkg/front_end/testcases/general/conditional_import.dart.strong.expect
+++ b/pkg/front_end/testcases/general/conditional_import.dart.strong.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:_http'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error (from dart:html)
 //           ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:_http'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error (from dart:html)
 //           ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
 //   request.response; // error
 //           ^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error
@@ -49,7 +49,7 @@ class HttpRequest extends core::Object {
 static method testA(_ht::HttpRequest request) → dynamic {
   request.{_ht::HttpRequest::certificate}{io::X509Certificate?};
   request.{_ht::HttpRequest::response}{_ht::HttpResponse};
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:_http'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error (from dart:html)
@@ -59,7 +59,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
 static method testB(_ht::HttpRequest request) → dynamic {
   request.{_ht::HttpRequest::certificate}{io::X509Certificate?};
   request.{_ht::HttpRequest::response}{_ht::HttpResponse};
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:_http'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error (from dart:html)
@@ -67,17 +67,17 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{core::Object::hashCode}{core::int};
 }
 static method testC(self::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error
           ^^^^^^^^^^^" in request{<unresolved>}.certificate;
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
   request.response; // error
           ^^^^^^^^" in request{<unresolved>}.response;
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error
diff --git a/pkg/front_end/testcases/general/conditional_import.dart.strong.modular.expect b/pkg/front_end/testcases/general/conditional_import.dart.strong.modular.expect
index 1b531b4123f..9fbb5ea31a9 100644
--- a/pkg/front_end/testcases/general/conditional_import.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/conditional_import.dart.strong.modular.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:_http'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error (from dart:html)
 //           ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:_http'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error (from dart:html)
 //           ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
 //   request.response; // error
 //           ^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error
@@ -49,7 +49,7 @@ class HttpRequest extends core::Object {
 static method testA(_ht::HttpRequest request) → dynamic {
   request.{_ht::HttpRequest::certificate}{io::X509Certificate?};
   request.{_ht::HttpRequest::response}{_ht::HttpResponse};
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:_http'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error (from dart:html)
@@ -59,7 +59,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
 static method testB(_ht::HttpRequest request) → dynamic {
   request.{_ht::HttpRequest::certificate}{io::X509Certificate?};
   request.{_ht::HttpRequest::response}{_ht::HttpResponse};
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:_http'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error (from dart:html)
@@ -67,17 +67,17 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{core::Object::hashCode}{core::int};
 }
 static method testC(self::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error
           ^^^^^^^^^^^" in request{<unresolved>}.certificate;
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
   request.response; // error
           ^^^^^^^^" in request{<unresolved>}.response;
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error
diff --git a/pkg/front_end/testcases/general/conditional_import.dart.strong.transformed.expect b/pkg/front_end/testcases/general/conditional_import.dart.strong.transformed.expect
index 1b531b4123f..9fbb5ea31a9 100644
--- a/pkg/front_end/testcases/general/conditional_import.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/conditional_import.dart.strong.transformed.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:_http'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error (from dart:html)
 //           ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'dart:_http'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error (from dart:html)
 //           ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
 //   request.certificate; // error
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
 //   request.response; // error
 //           ^^^^^^^^
 //
-// pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+// pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
 //  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
 //   request.readyState; // error
@@ -49,7 +49,7 @@ class HttpRequest extends core::Object {
 static method testA(_ht::HttpRequest request) → dynamic {
   request.{_ht::HttpRequest::certificate}{io::X509Certificate?};
   request.{_ht::HttpRequest::response}{_ht::HttpResponse};
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:22:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:_http'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error (from dart:html)
@@ -59,7 +59,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
 static method testB(_ht::HttpRequest request) → dynamic {
   request.{_ht::HttpRequest::certificate}{io::X509Certificate?};
   request.{_ht::HttpRequest::response}{_ht::HttpResponse};
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:29:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'dart:_http'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error (from dart:html)
@@ -67,17 +67,17 @@ Try correcting the name to the name of an existing getter, or defining a getter
   request.{core::Object::hashCode}{core::int};
 }
 static method testC(self::HttpRequest request) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:34:11: Error: The getter 'certificate' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'certificate'.
   request.certificate; // error
           ^^^^^^^^^^^" in request{<unresolved>}.certificate;
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:35:11: Error: The getter 'response' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'response'.
   request.response; // error
           ^^^^^^^^" in request{<unresolved>}.response;
-  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the class 'HttpRequest'.
+  invalid-expression "pkg/front_end/testcases/general/conditional_import.dart:36:11: Error: The getter 'readyState' isn't defined for the type 'HttpRequest'.
  - 'HttpRequest' is from 'pkg/front_end/testcases/general/conditional_import.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'readyState'.
   request.readyState; // error
diff --git a/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.expect b/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.expect
index d4dc6d12bab..651297519ef 100644
--- a/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.expect
+++ b/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.expect
@@ -6,7 +6,7 @@ library;
 //   lib(new C().missing());
 //   ^^^
 //
-// pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/continue_inference_after_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'missing'.
 //   lib(new C().missing());
@@ -25,7 +25,7 @@ class C extends core::Object {
 static method test() → dynamic {
   invalid-expression "pkg/front_end/testcases/general/continue_inference_after_error.dart:10:3: Error: A prefix can't be used as an expression.
   lib(new C().missing());
-  ^^^" in let final core::Object? #t1 = invalid-expression "pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the class 'C'.
+  ^^^" in let final core::Object? #t1 = invalid-expression "pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/continue_inference_after_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'missing'.
   lib(new C().missing());
diff --git a/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.modular.expect b/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.modular.expect
index d4dc6d12bab..651297519ef 100644
--- a/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.modular.expect
@@ -6,7 +6,7 @@ library;
 //   lib(new C().missing());
 //   ^^^
 //
-// pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/continue_inference_after_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'missing'.
 //   lib(new C().missing());
@@ -25,7 +25,7 @@ class C extends core::Object {
 static method test() → dynamic {
   invalid-expression "pkg/front_end/testcases/general/continue_inference_after_error.dart:10:3: Error: A prefix can't be used as an expression.
   lib(new C().missing());
-  ^^^" in let final core::Object? #t1 = invalid-expression "pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the class 'C'.
+  ^^^" in let final core::Object? #t1 = invalid-expression "pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/continue_inference_after_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'missing'.
   lib(new C().missing());
diff --git a/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.transformed.expect b/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.transformed.expect
index d4dc6d12bab..651297519ef 100644
--- a/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/continue_inference_after_error.dart.strong.transformed.expect
@@ -6,7 +6,7 @@ library;
 //   lib(new C().missing());
 //   ^^^
 //
-// pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/continue_inference_after_error.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'missing'.
 //   lib(new C().missing());
@@ -25,7 +25,7 @@ class C extends core::Object {
 static method test() → dynamic {
   invalid-expression "pkg/front_end/testcases/general/continue_inference_after_error.dart:10:3: Error: A prefix can't be used as an expression.
   lib(new C().missing());
-  ^^^" in let final core::Object? #t1 = invalid-expression "pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the class 'C'.
+  ^^^" in let final core::Object? #t1 = invalid-expression "pkg/front_end/testcases/general/continue_inference_after_error.dart:10:15: Error: The method 'missing' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/continue_inference_after_error.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'missing'.
   lib(new C().missing());
diff --git a/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.expect b/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.expect
index 48a5a56111a..2cca0d22f67 100644
--- a/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.expect
+++ b/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.expect
@@ -6,13 +6,13 @@ library;
 // mixin _PlatformViewGestureMixin on RenderBox implements MouseTrackerAnnotation {
 //                                                         ^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
 //  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_hitTestBehavior'.
 //       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
 //       ^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
 //  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'PlatformViewHitTestBehavior'.
 //       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
@@ -36,11 +36,11 @@ class PlatformViewRenderBox extends self::_PlatformViewRenderBox&RenderBox&_Plat
 }
 abstract class _PlatformViewGestureMixin extends mai::RenderBox /*isMixinDeclaration*/  {
   method hitTestSelf(self::Offset position) → core::bool
-    return !(invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+    return !(invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_hitTestBehavior'.
       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
-      ^^^^^^^^^^^^^^^^" in this{<unresolved>}._hitTestBehavior =={core::Object::==}{(core::Object) → core::bool} invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+      ^^^^^^^^^^^^^^^^" in this{<unresolved>}._hitTestBehavior =={core::Object::==}{(core::Object) → core::bool} invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'PlatformViewHitTestBehavior'.
       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
diff --git a/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.modular.expect b/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.modular.expect
index 48a5a56111a..2cca0d22f67 100644
--- a/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.modular.expect
@@ -6,13 +6,13 @@ library;
 // mixin _PlatformViewGestureMixin on RenderBox implements MouseTrackerAnnotation {
 //                                                         ^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
 //  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_hitTestBehavior'.
 //       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
 //       ^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
 //  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'PlatformViewHitTestBehavior'.
 //       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
@@ -36,11 +36,11 @@ class PlatformViewRenderBox extends self::_PlatformViewRenderBox&RenderBox&_Plat
 }
 abstract class _PlatformViewGestureMixin extends mai::RenderBox /*isMixinDeclaration*/  {
   method hitTestSelf(self::Offset position) → core::bool
-    return !(invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+    return !(invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_hitTestBehavior'.
       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
-      ^^^^^^^^^^^^^^^^" in this{<unresolved>}._hitTestBehavior =={core::Object::==}{(core::Object) → core::bool} invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+      ^^^^^^^^^^^^^^^^" in this{<unresolved>}._hitTestBehavior =={core::Object::==}{(core::Object) → core::bool} invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'PlatformViewHitTestBehavior'.
       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
diff --git a/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.transformed.expect
index 3bc7ccf4596..c75c694e498 100644
--- a/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/crashes/crash_03/main.dart.strong.transformed.expect
@@ -6,13 +6,13 @@ library;
 // mixin _PlatformViewGestureMixin on RenderBox implements MouseTrackerAnnotation {
 //                                                         ^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
 //  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_hitTestBehavior'.
 //       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
 //       ^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+// pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
 //  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'PlatformViewHitTestBehavior'.
 //       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
@@ -36,11 +36,11 @@ class PlatformViewRenderBox extends self::_PlatformViewRenderBox&RenderBox&_Plat
 }
 abstract class _PlatformViewGestureMixin extends mai::RenderBox /*isMixinDeclaration*/  {
   method hitTestSelf(self::Offset position) → core::bool
-    return !(invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+    return !(invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_hitTestBehavior'.
       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
-      ^^^^^^^^^^^^^^^^" in this{<unresolved>}._hitTestBehavior =={core::Object::==}{(core::Object) → core::bool} invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+      ^^^^^^^^^^^^^^^^" in this{<unresolved>}._hitTestBehavior =={core::Object::==}{(core::Object) → core::bool} invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'PlatformViewHitTestBehavior'.
       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
@@ -51,11 +51,11 @@ abstract class _PlatformViewRenderBox&RenderBox&_PlatformViewGestureMixin extend
     : super mai::RenderBox::•()
     ;
   method hitTestSelf(self::Offset position) → core::bool
-    return !(invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+    return !(invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:7: Error: The getter '_hitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_hitTestBehavior'.
       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
-      ^^^^^^^^^^^^^^^^" in this{<unresolved>}._hitTestBehavior =={core::Object::==}{(core::Object) → core::bool} invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the class '_PlatformViewGestureMixin'.
+      ^^^^^^^^^^^^^^^^" in this{<unresolved>}._hitTestBehavior =={core::Object::==}{(core::Object) → core::bool} invalid-expression "pkg/front_end/testcases/general/crashes/crash_03/main.dart:13:27: Error: The getter 'PlatformViewHitTestBehavior' isn't defined for the type '_PlatformViewGestureMixin'.
  - '_PlatformViewGestureMixin' is from 'pkg/front_end/testcases/general/crashes/crash_03/main.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'PlatformViewHitTestBehavior'.
       _hitTestBehavior != PlatformViewHitTestBehavior.transparent;
diff --git a/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.expect b/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.expect
index 4fcbab40af6..0ce1bbc266e 100644
--- a/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.expect
+++ b/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.expect
@@ -181,85 +181,85 @@ library;
 //   Class<int><int>.named<int><int>();
 //                                    ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named<int>();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>();
@@ -279,12 +279,12 @@ class Class<T extends core::Object? = dynamic> extends core::Object {
 static method test() → dynamic {
   #C1;
   new self::Class::•<core::int>();
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>;
        ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(<core::int>[]);
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>();
@@ -299,56 +299,56 @@ Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int>.named<int>;
              ^^^^^";
   new self::Class::named<core::int>();
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named;
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named;
                   ^^^^^" in <core::int>[]{<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named();
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named();
                   ^^^^^" in <core::int>[]{<unresolved>}.named());
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>;
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int>;
                   ^^^^^" in <core::int>[]{<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>();
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named<int>();
                   ^^^^^" in <core::int>[]{<unresolved>}.named<core::int>());
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>;
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>;
                   ^^^^^" in <core::int>[]{<unresolved>}.named){dynamic}.<(#C2){dynamic}.>(<core::int>[]);
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>();
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>();
diff --git a/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.modular.expect b/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.modular.expect
index 4fcbab40af6..0ce1bbc266e 100644
--- a/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.modular.expect
@@ -181,85 +181,85 @@ library;
 //   Class<int><int>.named<int><int>();
 //                                    ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named<int>();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>();
@@ -279,12 +279,12 @@ class Class<T extends core::Object? = dynamic> extends core::Object {
 static method test() → dynamic {
   #C1;
   new self::Class::•<core::int>();
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>;
        ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(<core::int>[]);
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>();
@@ -299,56 +299,56 @@ Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int>.named<int>;
              ^^^^^";
   new self::Class::named<core::int>();
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named;
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named;
                   ^^^^^" in <core::int>[]{<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named();
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named();
                   ^^^^^" in <core::int>[]{<unresolved>}.named());
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>;
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int>;
                   ^^^^^" in <core::int>[]{<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>();
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named<int>();
                   ^^^^^" in <core::int>[]{<unresolved>}.named<core::int>());
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>;
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>;
                   ^^^^^" in <core::int>[]{<unresolved>}.named){dynamic}.<(#C2){dynamic}.>(<core::int>[]);
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>();
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>();
diff --git a/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.transformed.expect b/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.transformed.expect
index f93258de868..5a1792d56c7 100644
--- a/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/duplicate_instantiation.dart.strong.transformed.expect
@@ -181,85 +181,85 @@ library;
 //   Class<int><int>.named<int><int>();
 //                                    ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int>();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'named'.
 //   Class<int><int>.named<int>();
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>;
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>;
 //                   ^^^^^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   Class<int><int>.named<int><int>();
 //        ^
 //
-// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+// pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
 //  - 'List' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //   Class<int><int>.named<int><int>();
@@ -279,12 +279,12 @@ class Class<T extends core::Object? = dynamic> extends core::Object {
 static method test() → dynamic {
   #C1;
   new self::Class::•<core::int>();
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:15:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>;
        ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(core::_GrowableList::•<core::int>(0));
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:16:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>();
@@ -299,56 +299,56 @@ Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int>.named<int>;
              ^^^^^";
   new self::Class::named<core::int>();
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named;
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:21:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named;
                   ^^^^^" in core::_GrowableList::•<core::int>(0){<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named();
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:22:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named();
                   ^^^^^" in core::_GrowableList::•<core::int>(0){<unresolved>}.named());
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>;
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:23:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int>;
                   ^^^^^" in core::_GrowableList::•<core::int>(0){<unresolved>}.named);
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int>();
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:24:19: Error: The method 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'named'.
   Class<int><int>.named<int>();
                   ^^^^^" in core::_GrowableList::•<core::int>(0){<unresolved>}.named<core::int>());
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>;
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:25:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>;
                   ^^^^^" in core::_GrowableList::•<core::int>(0){<unresolved>}.named){dynamic}.<(#C2){dynamic}.>(core::_GrowableList::•<core::int>(0));
-  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:8: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   Class<int><int>.named<int><int>();
-       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the class 'List<int>'.
+       ^" in #C1{<unresolved>}.<(#C2){dynamic}.>(invalid-expression "pkg/front_end/testcases/general/duplicate_instantiation.dart:26:19: Error: The getter 'named' isn't defined for the type 'List<int>'.
  - 'List' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
   Class<int><int>.named<int><int>();
diff --git a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.expect b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.expect
index 6cc397ae12d..ad7aeae0416 100644
--- a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.expect
+++ b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.expect
@@ -18,7 +18,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named '_foo'.
 //   i._foo(a: 0, (x) {
 //     ^^^^
@@ -29,7 +29,7 @@ import "dart:core" as core;
 import "org-dartlang-testcase:///weekly_bot_91_failure.dart";
 
 static method bar(core::int i) → dynamic {
-  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named '_foo'.
   i._foo(a: 0, (x) {
     ^^^^" in i{<unresolved>}._foo((dynamic x) → Null {
diff --git a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.modular.expect b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.modular.expect
index 6cc397ae12d..ad7aeae0416 100644
--- a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.modular.expect
@@ -18,7 +18,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named '_foo'.
 //   i._foo(a: 0, (x) {
 //     ^^^^
@@ -29,7 +29,7 @@ import "dart:core" as core;
 import "org-dartlang-testcase:///weekly_bot_91_failure.dart";
 
 static method bar(core::int i) → dynamic {
-  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named '_foo'.
   i._foo(a: 0, (x) {
     ^^^^" in i{<unresolved>}._foo((dynamic x) → Null {
diff --git a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.transformed.expect
index 6cc397ae12d..ad7aeae0416 100644
--- a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure.dart.strong.transformed.expect
@@ -18,7 +18,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named '_foo'.
 //   i._foo(a: 0, (x) {
 //     ^^^^
@@ -29,7 +29,7 @@ import "dart:core" as core;
 import "org-dartlang-testcase:///weekly_bot_91_failure.dart";
 
 static method bar(core::int i) → dynamic {
-  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named '_foo'.
   i._foo(a: 0, (x) {
     ^^^^" in i{<unresolved>}._foo((dynamic x) → Null {
diff --git a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.expect b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.expect
index 7fb2bb23106..584681bdb29 100644
--- a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.expect
+++ b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.expect
@@ -18,7 +18,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named '_foo'.
 //   i._foo((x) {
 //     ^^^^
@@ -29,7 +29,7 @@ import "dart:core" as core;
 import "org-dartlang-testcase:///weekly_bot_91_failure_variation_1.dart";
 
 static method bar(core::int i) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named '_foo'.
   i._foo((x) {
     ^^^^" in i{<unresolved>}._foo((dynamic x) → Null {
diff --git a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.modular.expect b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.modular.expect
index 7fb2bb23106..584681bdb29 100644
--- a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.modular.expect
@@ -18,7 +18,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named '_foo'.
 //   i._foo((x) {
 //     ^^^^
@@ -29,7 +29,7 @@ import "dart:core" as core;
 import "org-dartlang-testcase:///weekly_bot_91_failure_variation_1.dart";
 
 static method bar(core::int i) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named '_foo'.
   i._foo((x) {
     ^^^^" in i{<unresolved>}._foo((dynamic x) → Null {
diff --git a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.transformed.expect
index 7fb2bb23106..584681bdb29 100644
--- a/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1.dart.strong.transformed.expect
@@ -18,7 +18,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named '_foo'.
 //   i._foo((x) {
 //     ^^^^
@@ -29,7 +29,7 @@ import "dart:core" as core;
 import "org-dartlang-testcase:///weekly_bot_91_failure_variation_1.dart";
 
 static method bar(core::int i) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/general/error_recovery/weekly_bot_91_failure_variation_1_lib.dart:8:5: Error: The method '_foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named '_foo'.
   i._foo((x) {
     ^^^^" in i{<unresolved>}._foo((dynamic x) → Null {
diff --git a/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.expect b/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.expect
index 2f919b9e947..950cfdd0345 100644
--- a/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.expect
+++ b/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.expect
@@ -48,19 +48,19 @@ library;
 //     for (constant in []) {}
 //          ^^^^^^^^
 //
-// pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     for (unresolved in []) {}
 //          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     for (unresolved.foo in []) {}
 //          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     for (c.unresolved in []) {}
@@ -125,29 +125,29 @@ class C extends self::Super {
       c.{self::Super::untypedSuperInstanceField} = #t12;
     }
     for (final dynamic #t13 in <dynamic>[]) {
-      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
+      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (unresolved in []) {}
-         ^^^^^^^^^^" in this.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
+         ^^^^^^^^^^" in this.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (unresolved in []) {}
          ^^^^^^^^^^";
     }
     for (final dynamic #t14 in <dynamic>[]) {
-      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the class 'C'.
+      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     for (unresolved.foo in []) {}
          ^^^^^^^^^^" in this{<unresolved>}.unresolved.{<invalid>}foo = #t14;
     }
     for (final dynamic #t15 in <dynamic>[]) {
-      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
+      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (c.unresolved in []) {}
-           ^^^^^^^^^^" in c.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
+           ^^^^^^^^^^" in c.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (c.unresolved in []) {}
diff --git a/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.modular.expect b/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.modular.expect
index 2f919b9e947..950cfdd0345 100644
--- a/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.modular.expect
@@ -48,19 +48,19 @@ library;
 //     for (constant in []) {}
 //          ^^^^^^^^
 //
-// pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     for (unresolved in []) {}
 //          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     for (unresolved.foo in []) {}
 //          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     for (c.unresolved in []) {}
@@ -125,29 +125,29 @@ class C extends self::Super {
       c.{self::Super::untypedSuperInstanceField} = #t12;
     }
     for (final dynamic #t13 in <dynamic>[]) {
-      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
+      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (unresolved in []) {}
-         ^^^^^^^^^^" in this.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
+         ^^^^^^^^^^" in this.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (unresolved in []) {}
          ^^^^^^^^^^";
     }
     for (final dynamic #t14 in <dynamic>[]) {
-      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the class 'C'.
+      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     for (unresolved.foo in []) {}
          ^^^^^^^^^^" in this{<unresolved>}.unresolved.{<invalid>}foo = #t14;
     }
     for (final dynamic #t15 in <dynamic>[]) {
-      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
+      invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (c.unresolved in []) {}
-           ^^^^^^^^^^" in c.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
+           ^^^^^^^^^^" in c.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (c.unresolved in []) {}
diff --git a/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.transformed.expect b/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.transformed.expect
index a2e18926795..4f96b140457 100644
--- a/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.transformed.expect
@@ -48,19 +48,19 @@ library;
 //     for (constant in []) {}
 //          ^^^^^^^^
 //
-// pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     for (unresolved in []) {}
 //          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     for (unresolved.foo in []) {}
 //          ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     for (c.unresolved in []) {}
@@ -201,11 +201,11 @@ class C extends self::Super {
       for (; :sync-for-iterator.{core::Iterator::moveNext}(){() → core::bool}; ) {
         final dynamic #t13 = :sync-for-iterator.{core::Iterator::current}{dynamic};
         {
-          invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
+          invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (unresolved in []) {}
-         ^^^^^^^^^^" in this.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
+         ^^^^^^^^^^" in this.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:37:10: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (unresolved in []) {}
@@ -218,7 +218,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
       for (; :sync-for-iterator.{core::Iterator::moveNext}(){() → core::bool}; ) {
         final dynamic #t14 = :sync-for-iterator.{core::Iterator::current}{dynamic};
         {
-          invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the class 'C'.
+          invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:38:10: Error: The getter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     for (unresolved.foo in []) {}
@@ -231,11 +231,11 @@ Try correcting the name to the name of an existing getter, or defining a getter
       for (; :sync-for-iterator.{core::Iterator::moveNext}(){() → core::bool}; ) {
         final dynamic #t15 = :sync-for-iterator.{core::Iterator::current}{dynamic};
         {
-          invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
+          invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (c.unresolved in []) {}
-           ^^^^^^^^^^" in c.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
+           ^^^^^^^^^^" in c.{<unresolved>}unresolved = invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:39:12: Error: The setter 'unresolved' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/for_in_without_declaration.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     for (c.unresolved in []) {}
diff --git a/pkg/front_end/testcases/general/invalid_type.dart.strong.expect b/pkg/front_end/testcases/general/invalid_type.dart.strong.expect
index 3c2144ec37d..4f5a6b77392 100644
--- a/pkg/front_end/testcases/general/invalid_type.dart.strong.expect
+++ b/pkg/front_end/testcases/general/invalid_type.dart.strong.expect
@@ -10,7 +10,7 @@ library;
 //   (null as Missing).bar();
 //            ^^^^^^^
 //
-// pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the type 'Null'.
 // Try correcting the name to the name of an existing method, or defining a method named 'bar'.
 //   null.bar();
 //        ^^^
@@ -30,7 +30,7 @@ class C extends core::Object {
 }
 static method test() → dynamic {
   (null as invalid-type){dynamic}.bar();
-  invalid-expression "pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the type 'Null'.
 Try correcting the name to the name of an existing method, or defining a method named 'bar'.
   null.bar();
        ^^^" in null{<unresolved>}.bar();
diff --git a/pkg/front_end/testcases/general/invalid_type.dart.strong.modular.expect b/pkg/front_end/testcases/general/invalid_type.dart.strong.modular.expect
index 3c2144ec37d..4f5a6b77392 100644
--- a/pkg/front_end/testcases/general/invalid_type.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/invalid_type.dart.strong.modular.expect
@@ -10,7 +10,7 @@ library;
 //   (null as Missing).bar();
 //            ^^^^^^^
 //
-// pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the type 'Null'.
 // Try correcting the name to the name of an existing method, or defining a method named 'bar'.
 //   null.bar();
 //        ^^^
@@ -30,7 +30,7 @@ class C extends core::Object {
 }
 static method test() → dynamic {
   (null as invalid-type){dynamic}.bar();
-  invalid-expression "pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the type 'Null'.
 Try correcting the name to the name of an existing method, or defining a method named 'bar'.
   null.bar();
        ^^^" in null{<unresolved>}.bar();
diff --git a/pkg/front_end/testcases/general/invalid_type.dart.strong.transformed.expect b/pkg/front_end/testcases/general/invalid_type.dart.strong.transformed.expect
index 10c4f631d32..ad932200407 100644
--- a/pkg/front_end/testcases/general/invalid_type.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/invalid_type.dart.strong.transformed.expect
@@ -10,7 +10,7 @@ library;
 //   (null as Missing).bar();
 //            ^^^^^^^
 //
-// pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the type 'Null'.
 // Try correcting the name to the name of an existing method, or defining a method named 'bar'.
 //   null.bar();
 //        ^^^
@@ -30,7 +30,7 @@ class C extends core::Object {
 }
 static method test() → dynamic {
   (null as invalid-type){dynamic}.bar();
-  invalid-expression "pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/general/invalid_type.dart:13:8: Error: The method 'bar' isn't defined for the type 'Null'.
 Try correcting the name to the name of an existing method, or defining a method named 'bar'.
   null.bar();
        ^^^" in null{<unresolved>}.bar();
diff --git a/pkg/front_end/testcases/general/issue42997.dart.strong.expect b/pkg/front_end/testcases/general/issue42997.dart.strong.expect
index 6552560e9cd..3044012d5be 100644
--- a/pkg/front_end/testcases/general/issue42997.dart.strong.expect
+++ b/pkg/front_end/testcases/general/issue42997.dart.strong.expect
@@ -31,13 +31,13 @@ library;
 //     for (PropertyState<Object, Object>> state in _states) ;
 //                                               ^^
 //
-// pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the class 'PropertyState#1<I, O>'.
+// pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the type 'PropertyState#1<I, O>'.
 //  - 'PropertyState#1' is from 'pkg/front_end/testcases/general/issue42997.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'state'.
 //     for (PropertyState<Object, Object>> state in _states) ;
 //                                         ^^^^^
 //
-// pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '>>' operator.
 //     for (PropertyState<Object, Object>> state in _states) ;
@@ -57,11 +57,11 @@ class PropertyState#1<I extends core::Object? = dynamic, O extends core::Object?
     for (PropertyState<Object, Object>> state in _states) ;
                              ^"; invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:30: Error: This couldn't be parsed.
     for (PropertyState<Object, Object>> state in _states) ;
-                             ^", invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the class 'Type'.
+                             ^", invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '>>' operator.
     for (PropertyState<Object, Object>> state in _states) ;
-                                     ^^" in #C1{<unresolved>}.>>(invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the class 'PropertyState#1<I, O>'.
+                                     ^^" in #C1{<unresolved>}.>>(invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the type 'PropertyState#1<I, O>'.
  - 'PropertyState#1' is from 'pkg/front_end/testcases/general/issue42997.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'state'.
     for (PropertyState<Object, Object>> state in _states) ;
diff --git a/pkg/front_end/testcases/general/issue42997.dart.strong.modular.expect b/pkg/front_end/testcases/general/issue42997.dart.strong.modular.expect
index 6552560e9cd..3044012d5be 100644
--- a/pkg/front_end/testcases/general/issue42997.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/issue42997.dart.strong.modular.expect
@@ -31,13 +31,13 @@ library;
 //     for (PropertyState<Object, Object>> state in _states) ;
 //                                               ^^
 //
-// pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the class 'PropertyState#1<I, O>'.
+// pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the type 'PropertyState#1<I, O>'.
 //  - 'PropertyState#1' is from 'pkg/front_end/testcases/general/issue42997.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'state'.
 //     for (PropertyState<Object, Object>> state in _states) ;
 //                                         ^^^^^
 //
-// pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '>>' operator.
 //     for (PropertyState<Object, Object>> state in _states) ;
@@ -57,11 +57,11 @@ class PropertyState#1<I extends core::Object? = dynamic, O extends core::Object?
     for (PropertyState<Object, Object>> state in _states) ;
                              ^"; invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:30: Error: This couldn't be parsed.
     for (PropertyState<Object, Object>> state in _states) ;
-                             ^", invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the class 'Type'.
+                             ^", invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '>>' operator.
     for (PropertyState<Object, Object>> state in _states) ;
-                                     ^^" in #C1{<unresolved>}.>>(invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the class 'PropertyState#1<I, O>'.
+                                     ^^" in #C1{<unresolved>}.>>(invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the type 'PropertyState#1<I, O>'.
  - 'PropertyState#1' is from 'pkg/front_end/testcases/general/issue42997.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'state'.
     for (PropertyState<Object, Object>> state in _states) ;
diff --git a/pkg/front_end/testcases/general/issue42997.dart.strong.transformed.expect b/pkg/front_end/testcases/general/issue42997.dart.strong.transformed.expect
index 6552560e9cd..3044012d5be 100644
--- a/pkg/front_end/testcases/general/issue42997.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/issue42997.dart.strong.transformed.expect
@@ -31,13 +31,13 @@ library;
 //     for (PropertyState<Object, Object>> state in _states) ;
 //                                               ^^
 //
-// pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the class 'PropertyState#1<I, O>'.
+// pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the type 'PropertyState#1<I, O>'.
 //  - 'PropertyState#1' is from 'pkg/front_end/testcases/general/issue42997.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'state'.
 //     for (PropertyState<Object, Object>> state in _states) ;
 //                                         ^^^^^
 //
-// pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '>>' operator.
 //     for (PropertyState<Object, Object>> state in _states) ;
@@ -57,11 +57,11 @@ class PropertyState#1<I extends core::Object? = dynamic, O extends core::Object?
     for (PropertyState<Object, Object>> state in _states) ;
                              ^"; invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:30: Error: This couldn't be parsed.
     for (PropertyState<Object, Object>> state in _states) ;
-                             ^", invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the class 'Type'.
+                             ^", invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:38: Error: The operator '>>' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '>>' operator.
     for (PropertyState<Object, Object>> state in _states) ;
-                                     ^^" in #C1{<unresolved>}.>>(invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the class 'PropertyState#1<I, O>'.
+                                     ^^" in #C1{<unresolved>}.>>(invalid-expression "pkg/front_end/testcases/general/issue42997.dart:12:41: Error: The getter 'state' isn't defined for the type 'PropertyState#1<I, O>'.
  - 'PropertyState#1' is from 'pkg/front_end/testcases/general/issue42997.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'state'.
     for (PropertyState<Object, Object>> state in _states) ;
diff --git a/pkg/front_end/testcases/general/issue49040.dart.strong.expect b/pkg/front_end/testcases/general/issue49040.dart.strong.expect
index 863588751e4..c5664cf9d25 100644
--- a/pkg/front_end/testcases/general/issue49040.dart.strong.expect
+++ b/pkg/front_end/testcases/general/issue49040.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   i.foo(a: 0, 1);
 //     ^^^
@@ -11,7 +11,7 @@ import self as self;
 import "dart:core" as core;
 
 static method bar(core::int i) → dynamic {
-  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the class 'int'.
+  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   i.foo(a: 0, 1);
     ^^^" in i{<unresolved>}.foo(1, a: #t1);
diff --git a/pkg/front_end/testcases/general/issue49040.dart.strong.modular.expect b/pkg/front_end/testcases/general/issue49040.dart.strong.modular.expect
index 863588751e4..c5664cf9d25 100644
--- a/pkg/front_end/testcases/general/issue49040.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/issue49040.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   i.foo(a: 0, 1);
 //     ^^^
@@ -11,7 +11,7 @@ import self as self;
 import "dart:core" as core;
 
 static method bar(core::int i) → dynamic {
-  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the class 'int'.
+  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   i.foo(a: 0, 1);
     ^^^" in i{<unresolved>}.foo(1, a: #t1);
diff --git a/pkg/front_end/testcases/general/issue49040.dart.strong.transformed.expect b/pkg/front_end/testcases/general/issue49040.dart.strong.transformed.expect
index 863588751e4..c5664cf9d25 100644
--- a/pkg/front_end/testcases/general/issue49040.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/issue49040.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   i.foo(a: 0, 1);
 //     ^^^
@@ -11,7 +11,7 @@ import self as self;
 import "dart:core" as core;
 
 static method bar(core::int i) → dynamic {
-  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the class 'int'.
+  let final core::int #t1 = 0 in invalid-expression "pkg/front_end/testcases/general/issue49040.dart:6:5: Error: The method 'foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   i.foo(a: 0, 1);
     ^^^" in i{<unresolved>}.foo(1, a: #t1);
diff --git a/pkg/front_end/testcases/general/lookup.dart.strong.expect b/pkg/front_end/testcases/general/lookup.dart.strong.expect
index 5d9e0761382..9a0ccf8aa79 100644
--- a/pkg/front_end/testcases/general/lookup.dart.strong.expect
+++ b/pkg/front_end/testcases/general/lookup.dart.strong.expect
@@ -47,13 +47,13 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
@@ -123,13 +123,13 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
@@ -203,13 +203,13 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
@@ -291,12 +291,12 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
 //     ^^^^^^^^^^
@@ -373,12 +373,12 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
 //     ^^^^^^^^^^
@@ -472,7 +472,7 @@ class Class<T extends core::Object? = dynamic> extends self::SuperClass {
     parameter = null;
     local;
     local = null;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
@@ -489,7 +489,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     self::Class::staticField;
     #C4;
     self::topLevelField;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
@@ -595,7 +595,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
     parameter = null;
     local;
     local = null;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
@@ -613,7 +613,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     self::Class::staticField;
     #C4;
     self::topLevelField;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
@@ -797,7 +797,7 @@ static extension-member method Extension|instanceTest<T extends core::Object? =
   parameter = null;
   local;
   local = null;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
@@ -815,7 +815,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   #C6;
   #C4;
   self::topLevelField;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
@@ -937,7 +937,7 @@ static extension-type-member method ExtensionType|constructor#<T extends core::O
     parameter = null;
     local;
     local = null;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
     ^^^^^^^^^^" in #this{<unresolved>}.unresolved;
@@ -953,7 +953,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     #C7;
     #C4;
     self::topLevelField;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
     ^^^^^^^^^^" in #this.{<unresolved>}unresolved = null;
@@ -1071,7 +1071,7 @@ static extension-type-member method ExtensionType|instanceTest<T extends core::O
   parameter = null;
   local;
   local = null;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
     ^^^^^^^^^^" in #this{<unresolved>}.unresolved;
@@ -1088,7 +1088,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   #C7;
   #C4;
   self::topLevelField;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
     ^^^^^^^^^^" in #this.{<unresolved>}unresolved = null;
diff --git a/pkg/front_end/testcases/general/lookup.dart.strong.modular.expect b/pkg/front_end/testcases/general/lookup.dart.strong.modular.expect
index 5d9e0761382..9a0ccf8aa79 100644
--- a/pkg/front_end/testcases/general/lookup.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/lookup.dart.strong.modular.expect
@@ -47,13 +47,13 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
@@ -123,13 +123,13 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
@@ -203,13 +203,13 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
@@ -291,12 +291,12 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
 //     ^^^^^^^^^^
@@ -373,12 +373,12 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
 //     ^^^^^^^^^^
@@ -472,7 +472,7 @@ class Class<T extends core::Object? = dynamic> extends self::SuperClass {
     parameter = null;
     local;
     local = null;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
@@ -489,7 +489,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     self::Class::staticField;
     #C4;
     self::topLevelField;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
@@ -595,7 +595,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
     parameter = null;
     local;
     local = null;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
@@ -613,7 +613,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     self::Class::staticField;
     #C4;
     self::topLevelField;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
@@ -797,7 +797,7 @@ static extension-member method Extension|instanceTest<T extends core::Object? =
   parameter = null;
   local;
   local = null;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
@@ -815,7 +815,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   #C6;
   #C4;
   self::topLevelField;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
@@ -937,7 +937,7 @@ static extension-type-member method ExtensionType|constructor#<T extends core::O
     parameter = null;
     local;
     local = null;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
     ^^^^^^^^^^" in #this{<unresolved>}.unresolved;
@@ -953,7 +953,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     #C7;
     #C4;
     self::topLevelField;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
     ^^^^^^^^^^" in #this.{<unresolved>}unresolved = null;
@@ -1071,7 +1071,7 @@ static extension-type-member method ExtensionType|instanceTest<T extends core::O
   parameter = null;
   local;
   local = null;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
     ^^^^^^^^^^" in #this{<unresolved>}.unresolved;
@@ -1088,7 +1088,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   #C7;
   #C4;
   self::topLevelField;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
     ^^^^^^^^^^" in #this.{<unresolved>}unresolved = null;
diff --git a/pkg/front_end/testcases/general/lookup.dart.strong.transformed.expect b/pkg/front_end/testcases/general/lookup.dart.strong.transformed.expect
index 5d9e0761382..9a0ccf8aa79 100644
--- a/pkg/front_end/testcases/general/lookup.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/lookup.dart.strong.transformed.expect
@@ -47,13 +47,13 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
@@ -123,13 +123,13 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
@@ -203,13 +203,13 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+// pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
@@ -291,12 +291,12 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
 //     ^^^^^^^^^^
@@ -373,12 +373,12 @@ library;
 //     prefix.unresolved = null; // Error
 //            ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //     unresolved; // Error
 //     ^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+// pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //     unresolved = null; // Error
 //     ^^^^^^^^^^
@@ -472,7 +472,7 @@ class Class<T extends core::Object? = dynamic> extends self::SuperClass {
     parameter = null;
     local;
     local = null;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:77:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
@@ -489,7 +489,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     self::Class::staticField;
     #C4;
     self::topLevelField;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:91:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
@@ -595,7 +595,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
     parameter = null;
     local;
     local = null;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:169:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
@@ -613,7 +613,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     self::Class::staticField;
     #C4;
     self::topLevelField;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:184:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
@@ -797,7 +797,7 @@ static extension-member method Extension|instanceTest<T extends core::Object? =
   parameter = null;
   local;
   local = null;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the class 'Class<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:268:5: Error: The getter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
@@ -815,7 +815,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   #C6;
   #C4;
   self::topLevelField;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the class 'Class<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:283:5: Error: The setter 'unresolved' isn't defined for the type 'Class<T>'.
  - 'Class' is from 'pkg/front_end/testcases/general/lookup.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
@@ -937,7 +937,7 @@ static extension-type-member method ExtensionType|constructor#<T extends core::O
     parameter = null;
     local;
     local = null;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:367:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
     ^^^^^^^^^^" in #this{<unresolved>}.unresolved;
@@ -953,7 +953,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     #C7;
     #C4;
     self::topLevelField;
-    invalid-expression "pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+    invalid-expression "pkg/front_end/testcases/general/lookup.dart:381:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
     ^^^^^^^^^^" in #this.{<unresolved>}unresolved = null;
@@ -1071,7 +1071,7 @@ static extension-type-member method ExtensionType|instanceTest<T extends core::O
   parameter = null;
   local;
   local = null;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:461:5: Error: The getter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
     unresolved; // Error
     ^^^^^^^^^^" in #this{<unresolved>}.unresolved;
@@ -1088,7 +1088,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   #C7;
   #C4;
   self::topLevelField;
-  invalid-expression "pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the class 'ExtensionType<T>'.
+  invalid-expression "pkg/front_end/testcases/general/lookup.dart:476:5: Error: The setter 'unresolved' isn't defined for the type 'ExtensionType<T>'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
     unresolved = null; // Error
     ^^^^^^^^^^" in #this.{<unresolved>}unresolved = null;
diff --git a/pkg/front_end/testcases/general/many_errors.dart.strong.expect b/pkg/front_end/testcases/general/many_errors.dart.strong.expect
index 4b219e1a245..b87b7f9182b 100644
--- a/pkg/front_end/testcases/general/many_errors.dart.strong.expect
+++ b/pkg/front_end/testcases/general/many_errors.dart.strong.expect
@@ -39,7 +39,7 @@ library;
 //   const AbstractClass.id();
 //         ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the class 'B'.
+// pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the type 'B'.
 //  - 'B' is from 'pkg/front_end/testcases/general/many_errors.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 //   (new C().b ??= new B()).b;
@@ -87,7 +87,7 @@ external foo(String x) {
 }
 static method m() → dynamic {
   invalid-expression "The class 'AbstractClass' is abstract and can't be instantiated.";
-  invalid-expression "pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the class 'B'.
+  invalid-expression "pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the type 'B'.
  - 'B' is from 'pkg/front_end/testcases/general/many_errors.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
   (new C().b ??= new B()).b;
diff --git a/pkg/front_end/testcases/general/many_errors.dart.strong.modular.expect b/pkg/front_end/testcases/general/many_errors.dart.strong.modular.expect
index 4b219e1a245..b87b7f9182b 100644
--- a/pkg/front_end/testcases/general/many_errors.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/many_errors.dart.strong.modular.expect
@@ -39,7 +39,7 @@ library;
 //   const AbstractClass.id();
 //         ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the class 'B'.
+// pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the type 'B'.
 //  - 'B' is from 'pkg/front_end/testcases/general/many_errors.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 //   (new C().b ??= new B()).b;
@@ -87,7 +87,7 @@ external foo(String x) {
 }
 static method m() → dynamic {
   invalid-expression "The class 'AbstractClass' is abstract and can't be instantiated.";
-  invalid-expression "pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the class 'B'.
+  invalid-expression "pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the type 'B'.
  - 'B' is from 'pkg/front_end/testcases/general/many_errors.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
   (new C().b ??= new B()).b;
diff --git a/pkg/front_end/testcases/general/many_errors.dart.strong.transformed.expect b/pkg/front_end/testcases/general/many_errors.dart.strong.transformed.expect
index 4b219e1a245..b87b7f9182b 100644
--- a/pkg/front_end/testcases/general/many_errors.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/many_errors.dart.strong.transformed.expect
@@ -39,7 +39,7 @@ library;
 //   const AbstractClass.id();
 //         ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the class 'B'.
+// pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the type 'B'.
 //  - 'B' is from 'pkg/front_end/testcases/general/many_errors.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 //   (new C().b ??= new B()).b;
@@ -87,7 +87,7 @@ external foo(String x) {
 }
 static method m() → dynamic {
   invalid-expression "The class 'AbstractClass' is abstract and can't be instantiated.";
-  invalid-expression "pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the class 'B'.
+  invalid-expression "pkg/front_end/testcases/general/many_errors.dart:29:27: Error: The getter 'b' isn't defined for the type 'B'.
  - 'B' is from 'pkg/front_end/testcases/general/many_errors.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
   (new C().b ??= new B()).b;
diff --git a/pkg/front_end/testcases/general/missing_toplevel.dart.strong.expect b/pkg/front_end/testcases/general/missing_toplevel.dart.strong.expect
index c57b09be334..ffcdcfabc69 100644
--- a/pkg/front_end/testcases/general/missing_toplevel.dart.strong.expect
+++ b/pkg/front_end/testcases/general/missing_toplevel.dart.strong.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 // var missingBinary = classWithProperty.property += 2;
 //                                                ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the type 'ClassWithIndexSet'.
 //  - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 // var missingIndexGet = classWithIndexSet[0] ??= 2;
 //                                        ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the type 'ClassWithIndexGet'.
 //  - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 // var missingIndexSet = classWithIndexGet[0] ??= 2;
 //                                        ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 // var missingPropertyGet = emptyClass.property;
 //                                     ^^^^^^^^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 // var missingPropertySet = emptyClass.property = 42;
@@ -63,27 +63,27 @@ static field self::EmptyClass emptyClass = new self::EmptyClass::•();
 static field self::ClassWithProperty classWithProperty = new self::ClassWithProperty::•();
 static field self::ClassWithIndexSet classWithIndexSet = new self::ClassWithIndexSet::•();
 static field self::ClassWithIndexGet classWithIndexGet = new self::ClassWithIndexGet::•();
-static field dynamic missingBinary = let final self::ClassWithProperty #t1 = self::classWithProperty in #t1.{self::ClassWithProperty::property} = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
+static field dynamic missingBinary = let final self::ClassWithProperty #t1 = self::classWithProperty in #t1.{self::ClassWithProperty::property} = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the type 'EmptyClass'.
  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
 var missingBinary = classWithProperty.property += 2;
                                                ^" in #t1.{self::ClassWithProperty::property}{self::EmptyClass}{<unresolved>}.+(2) as{TypeError,ForDynamic} self::EmptyClass;
-static field dynamic missingIndexGet = let final self::ClassWithIndexSet #t2 = self::classWithIndexSet in let final core::int #t3 = 0 in let final dynamic #t4 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
+static field dynamic missingIndexGet = let final self::ClassWithIndexSet #t2 = self::classWithIndexSet in let final core::int #t3 = 0 in let final dynamic #t4 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the type 'ClassWithIndexSet'.
  - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
 var missingIndexGet = classWithIndexSet[0] ??= 2;
                                        ^" in #t2{<unresolved>}.[](#t3) in #t4 == null ?{dynamic} let final core::int #t5 = 2 in let final void #t6 = #t2.{self::ClassWithIndexSet::[]=}(#t3, #t5){(core::int, core::int) → void} in #t5 : #t4;
-static field core::int missingIndexSet = let final self::ClassWithIndexGet #t7 = self::classWithIndexGet in let final core::int #t8 = 0 in let final core::int? #t9 = #t7.{self::ClassWithIndexGet::[]}(#t8){(core::int) → core::int?} in #t9 == null ?{core::int} let final core::int #t10 = 2 in let final void #t11 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
+static field core::int missingIndexSet = let final self::ClassWithIndexGet #t7 = self::classWithIndexGet in let final core::int #t8 = 0 in let final core::int? #t9 = #t7.{self::ClassWithIndexGet::[]}(#t8){(core::int) → core::int?} in #t9 == null ?{core::int} let final core::int #t10 = 2 in let final void #t11 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the type 'ClassWithIndexGet'.
  - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
 var missingIndexSet = classWithIndexGet[0] ??= 2;
                                        ^" in #t7{<unresolved>}.[]=(#t8, #t10) in #t10 : #t9{core::int};
-static field dynamic missingPropertyGet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
+static field dynamic missingPropertyGet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the type 'EmptyClass'.
  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 var missingPropertyGet = emptyClass.property;
                                     ^^^^^^^^" in self::emptyClass{<unresolved>}.property;
-static field core::int missingPropertySet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
+static field core::int missingPropertySet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the type 'EmptyClass'.
  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 var missingPropertySet = emptyClass.property = 42;
diff --git a/pkg/front_end/testcases/general/missing_toplevel.dart.strong.modular.expect b/pkg/front_end/testcases/general/missing_toplevel.dart.strong.modular.expect
index c57b09be334..ffcdcfabc69 100644
--- a/pkg/front_end/testcases/general/missing_toplevel.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/missing_toplevel.dart.strong.modular.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 // var missingBinary = classWithProperty.property += 2;
 //                                                ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the type 'ClassWithIndexSet'.
 //  - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 // var missingIndexGet = classWithIndexSet[0] ??= 2;
 //                                        ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the type 'ClassWithIndexGet'.
 //  - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 // var missingIndexSet = classWithIndexGet[0] ??= 2;
 //                                        ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 // var missingPropertyGet = emptyClass.property;
 //                                     ^^^^^^^^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 // var missingPropertySet = emptyClass.property = 42;
@@ -63,27 +63,27 @@ static field self::EmptyClass emptyClass = new self::EmptyClass::•();
 static field self::ClassWithProperty classWithProperty = new self::ClassWithProperty::•();
 static field self::ClassWithIndexSet classWithIndexSet = new self::ClassWithIndexSet::•();
 static field self::ClassWithIndexGet classWithIndexGet = new self::ClassWithIndexGet::•();
-static field dynamic missingBinary = let final self::ClassWithProperty #t1 = self::classWithProperty in #t1.{self::ClassWithProperty::property} = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
+static field dynamic missingBinary = let final self::ClassWithProperty #t1 = self::classWithProperty in #t1.{self::ClassWithProperty::property} = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the type 'EmptyClass'.
  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
 var missingBinary = classWithProperty.property += 2;
                                                ^" in #t1.{self::ClassWithProperty::property}{self::EmptyClass}{<unresolved>}.+(2) as{TypeError,ForDynamic} self::EmptyClass;
-static field dynamic missingIndexGet = let final self::ClassWithIndexSet #t2 = self::classWithIndexSet in let final core::int #t3 = 0 in let final dynamic #t4 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
+static field dynamic missingIndexGet = let final self::ClassWithIndexSet #t2 = self::classWithIndexSet in let final core::int #t3 = 0 in let final dynamic #t4 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the type 'ClassWithIndexSet'.
  - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
 var missingIndexGet = classWithIndexSet[0] ??= 2;
                                        ^" in #t2{<unresolved>}.[](#t3) in #t4 == null ?{dynamic} let final core::int #t5 = 2 in let final void #t6 = #t2.{self::ClassWithIndexSet::[]=}(#t3, #t5){(core::int, core::int) → void} in #t5 : #t4;
-static field core::int missingIndexSet = let final self::ClassWithIndexGet #t7 = self::classWithIndexGet in let final core::int #t8 = 0 in let final core::int? #t9 = #t7.{self::ClassWithIndexGet::[]}(#t8){(core::int) → core::int?} in #t9 == null ?{core::int} let final core::int #t10 = 2 in let final void #t11 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
+static field core::int missingIndexSet = let final self::ClassWithIndexGet #t7 = self::classWithIndexGet in let final core::int #t8 = 0 in let final core::int? #t9 = #t7.{self::ClassWithIndexGet::[]}(#t8){(core::int) → core::int?} in #t9 == null ?{core::int} let final core::int #t10 = 2 in let final void #t11 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the type 'ClassWithIndexGet'.
  - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
 var missingIndexSet = classWithIndexGet[0] ??= 2;
                                        ^" in #t7{<unresolved>}.[]=(#t8, #t10) in #t10 : #t9{core::int};
-static field dynamic missingPropertyGet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
+static field dynamic missingPropertyGet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the type 'EmptyClass'.
  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 var missingPropertyGet = emptyClass.property;
                                     ^^^^^^^^" in self::emptyClass{<unresolved>}.property;
-static field core::int missingPropertySet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
+static field core::int missingPropertySet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the type 'EmptyClass'.
  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 var missingPropertySet = emptyClass.property = 42;
diff --git a/pkg/front_end/testcases/general/missing_toplevel.dart.strong.outline.expect b/pkg/front_end/testcases/general/missing_toplevel.dart.strong.outline.expect
index 93a7514a269..da4f534b8d8 100644
--- a/pkg/front_end/testcases/general/missing_toplevel.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/missing_toplevel.dart.strong.outline.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 // var missingBinary = classWithProperty.property += 2;
 //                                                ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the type 'ClassWithIndexSet'.
 //  - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 // var missingIndexGet = classWithIndexSet[0] ??= 2;
 //                                        ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the type 'ClassWithIndexGet'.
 //  - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 // var missingIndexSet = classWithIndexGet[0] ??= 2;
 //                                        ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 // var missingPropertyGet = emptyClass.property;
 //                                     ^^^^^^^^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 // var missingPropertySet = emptyClass.property = 42;
diff --git a/pkg/front_end/testcases/general/missing_toplevel.dart.strong.transformed.expect b/pkg/front_end/testcases/general/missing_toplevel.dart.strong.transformed.expect
index 070fe42baac..88c9e3ebee9 100644
--- a/pkg/front_end/testcases/general/missing_toplevel.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/missing_toplevel.dart.strong.transformed.expect
@@ -2,31 +2,31 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 // var missingBinary = classWithProperty.property += 2;
 //                                                ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the type 'ClassWithIndexSet'.
 //  - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 // var missingIndexGet = classWithIndexSet[0] ??= 2;
 //                                        ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the type 'ClassWithIndexGet'.
 //  - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 // var missingIndexSet = classWithIndexGet[0] ??= 2;
 //                                        ^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 // var missingPropertyGet = emptyClass.property;
 //                                     ^^^^^^^^
 //
-// pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
+// pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the type 'EmptyClass'.
 //  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 // var missingPropertySet = emptyClass.property = 42;
@@ -63,27 +63,27 @@ static field self::EmptyClass emptyClass = new self::EmptyClass::•();
 static field self::ClassWithProperty classWithProperty = new self::ClassWithProperty::•();
 static field self::ClassWithIndexSet classWithIndexSet = new self::ClassWithIndexSet::•();
 static field self::ClassWithIndexGet classWithIndexGet = new self::ClassWithIndexGet::•();
-static field dynamic missingBinary = let final self::ClassWithProperty #t1 = self::classWithProperty in #t1.{self::ClassWithProperty::property} = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
+static field dynamic missingBinary = let final self::ClassWithProperty #t1 = self::classWithProperty in #t1.{self::ClassWithProperty::property} = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:27:48: Error: The operator '+' isn't defined for the type 'EmptyClass'.
  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
 var missingBinary = classWithProperty.property += 2;
                                                ^" in #t1.{self::ClassWithProperty::property}{self::EmptyClass}{<unresolved>}.+(2) as{TypeError,ForDynamic,Unchecked} self::EmptyClass;
-static field dynamic missingIndexGet = let final self::ClassWithIndexSet #t2 = self::classWithIndexSet in let final core::int #t3 = 0 in let final dynamic #t4 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
+static field dynamic missingIndexGet = let final self::ClassWithIndexSet #t2 = self::classWithIndexSet in let final core::int #t3 = 0 in let final dynamic #t4 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:28:40: Error: The operator '[]' isn't defined for the type 'ClassWithIndexSet'.
  - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
 var missingIndexGet = classWithIndexSet[0] ??= 2;
                                        ^" in #t2{<unresolved>}.[](#t3) in #t4 == null ?{dynamic} let final core::int #t5 = 2 in let final void #t6 = #t2.{self::ClassWithIndexSet::[]=}(#t3, #t5){(core::int, core::int) → void} in #t5 : #t4;
-static field core::int missingIndexSet = let final self::ClassWithIndexGet #t7 = self::classWithIndexGet in let final core::int #t8 = 0 in let final core::int? #t9 = #t7.{self::ClassWithIndexGet::[]}(#t8){(core::int) → core::int?} in #t9 == null ?{core::int} let final core::int #t10 = 2 in let final void #t11 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
+static field core::int missingIndexSet = let final self::ClassWithIndexGet #t7 = self::classWithIndexGet in let final core::int #t8 = 0 in let final core::int? #t9 = #t7.{self::ClassWithIndexGet::[]}(#t8){(core::int) → core::int?} in #t9 == null ?{core::int} let final core::int #t10 = 2 in let final void #t11 = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:29:40: Error: The operator '[]=' isn't defined for the type 'ClassWithIndexGet'.
  - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
 var missingIndexSet = classWithIndexGet[0] ??= 2;
                                        ^" in #t7{<unresolved>}.[]=(#t8, #t10) in #t10 : #t9{core::int};
-static field dynamic missingPropertyGet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
+static field dynamic missingPropertyGet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:30:37: Error: The getter 'property' isn't defined for the type 'EmptyClass'.
  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
 var missingPropertyGet = emptyClass.property;
                                     ^^^^^^^^" in self::emptyClass{<unresolved>}.property;
-static field core::int missingPropertySet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
+static field core::int missingPropertySet = invalid-expression "pkg/front_end/testcases/general/missing_toplevel.dart:31:37: Error: The setter 'property' isn't defined for the type 'EmptyClass'.
  - 'EmptyClass' is from 'pkg/front_end/testcases/general/missing_toplevel.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
 var missingPropertySet = emptyClass.property = 42;
diff --git a/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.expect b/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.expect
index c2b6286300d..abb1af75c6a 100644
--- a/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.expect
+++ b/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.expect
@@ -88,115 +88,115 @@ library;
 //   print(foo ~ 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   print(foo < 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '>' operator.
 //   print(foo > 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '<=' operator.
 //   print(foo <= 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '>=' operator.
 //   print(foo >= 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '-' operator.
 //   print(foo - 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //   print(foo + 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '/' operator.
 //   print(foo / 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '~/' operator.
 //   print(foo ~/ 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '*' operator.
 //   print(foo * 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '%' operator.
 //   print(foo % 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '|' operator.
 //   print(foo | 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '^' operator.
 //   print(foo ^ 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '&' operator.
 //   print(foo & 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '<<' operator.
 //   print(foo << 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '>>' operator.
 //   print(foo >> 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //   print(foo[2] = 2);
 //            ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //   print(foo[2]);
 //            ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '~' operator.
 //   print(~foo);
 //         ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 //   print(-foo);
@@ -212,98 +212,98 @@ class Foo extends core::Object {
 }
 static method main() → dynamic {
   self::Foo foo = new self::Foo::•();
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   print(foo < 2);
             ^" in foo{<unresolved>}.<(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '>' operator.
   print(foo > 2);
             ^" in foo{<unresolved>}.>(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '<=' operator.
   print(foo <= 2);
             ^^" in foo{<unresolved>}.<=(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '>=' operator.
   print(foo >= 2);
             ^^" in foo{<unresolved>}.>=(2));
   core::print(foo =={core::Object::==}{(core::Object) → core::bool} 2);
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '-' operator.
   print(foo - 2);
             ^" in foo{<unresolved>}.-(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
   print(foo + 2);
             ^" in foo{<unresolved>}.+(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '/' operator.
   print(foo / 2);
             ^" in foo{<unresolved>}./(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '~/' operator.
   print(foo ~/ 2);
             ^^" in foo{<unresolved>}.~/(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '*' operator.
   print(foo * 2);
             ^" in foo{<unresolved>}.*(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '%' operator.
   print(foo % 2);
             ^" in foo{<unresolved>}.%(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '|' operator.
   print(foo | 2);
             ^" in foo{<unresolved>}.|(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '^' operator.
   print(foo ^ 2);
             ^" in foo{<unresolved>}.^(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '&' operator.
   print(foo & 2);
             ^" in foo{<unresolved>}.&(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '<<' operator.
   print(foo << 2);
             ^^" in foo{<unresolved>}.<<(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '>>' operator.
   print(foo >> 2);
             ^^" in foo{<unresolved>}.>>(2));
-  core::print(let final self::Foo #t1 = foo in let final core::int #t2 = 2 in let final core::int #t3 = 2 in let final void #t4 = invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the class 'Foo'.
+  core::print(let final self::Foo #t1 = foo in let final core::int #t2 = 2 in let final core::int #t3 = 2 in let final void #t4 = invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
   print(foo[2] = 2);
            ^" in #t1{<unresolved>}.[]=(#t2, #t3) in #t3);
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
   print(foo[2]);
            ^" in foo{<unresolved>}.[](2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '~' operator.
   print(~foo);
         ^" in foo{<unresolved>}.~());
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
   print(-foo);
diff --git a/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.modular.expect b/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.modular.expect
index c2b6286300d..abb1af75c6a 100644
--- a/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.modular.expect
@@ -88,115 +88,115 @@ library;
 //   print(foo ~ 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   print(foo < 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '>' operator.
 //   print(foo > 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '<=' operator.
 //   print(foo <= 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '>=' operator.
 //   print(foo >= 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '-' operator.
 //   print(foo - 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //   print(foo + 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '/' operator.
 //   print(foo / 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '~/' operator.
 //   print(foo ~/ 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '*' operator.
 //   print(foo * 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '%' operator.
 //   print(foo % 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '|' operator.
 //   print(foo | 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '^' operator.
 //   print(foo ^ 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '&' operator.
 //   print(foo & 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '<<' operator.
 //   print(foo << 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '>>' operator.
 //   print(foo >> 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //   print(foo[2] = 2);
 //            ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //   print(foo[2]);
 //            ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '~' operator.
 //   print(~foo);
 //         ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 //   print(-foo);
@@ -212,98 +212,98 @@ class Foo extends core::Object {
 }
 static method main() → dynamic {
   self::Foo foo = new self::Foo::•();
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   print(foo < 2);
             ^" in foo{<unresolved>}.<(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '>' operator.
   print(foo > 2);
             ^" in foo{<unresolved>}.>(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '<=' operator.
   print(foo <= 2);
             ^^" in foo{<unresolved>}.<=(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '>=' operator.
   print(foo >= 2);
             ^^" in foo{<unresolved>}.>=(2));
   core::print(foo =={core::Object::==}{(core::Object) → core::bool} 2);
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '-' operator.
   print(foo - 2);
             ^" in foo{<unresolved>}.-(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
   print(foo + 2);
             ^" in foo{<unresolved>}.+(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '/' operator.
   print(foo / 2);
             ^" in foo{<unresolved>}./(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '~/' operator.
   print(foo ~/ 2);
             ^^" in foo{<unresolved>}.~/(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '*' operator.
   print(foo * 2);
             ^" in foo{<unresolved>}.*(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '%' operator.
   print(foo % 2);
             ^" in foo{<unresolved>}.%(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '|' operator.
   print(foo | 2);
             ^" in foo{<unresolved>}.|(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '^' operator.
   print(foo ^ 2);
             ^" in foo{<unresolved>}.^(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '&' operator.
   print(foo & 2);
             ^" in foo{<unresolved>}.&(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '<<' operator.
   print(foo << 2);
             ^^" in foo{<unresolved>}.<<(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '>>' operator.
   print(foo >> 2);
             ^^" in foo{<unresolved>}.>>(2));
-  core::print(let final self::Foo #t1 = foo in let final core::int #t2 = 2 in let final core::int #t3 = 2 in let final void #t4 = invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the class 'Foo'.
+  core::print(let final self::Foo #t1 = foo in let final core::int #t2 = 2 in let final core::int #t3 = 2 in let final void #t4 = invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
   print(foo[2] = 2);
            ^" in #t1{<unresolved>}.[]=(#t2, #t3) in #t3);
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
   print(foo[2]);
            ^" in foo{<unresolved>}.[](2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '~' operator.
   print(~foo);
         ^" in foo{<unresolved>}.~());
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
   print(-foo);
diff --git a/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.transformed.expect b/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.transformed.expect
index ad4efbd31ce..d8d6fcb9113 100644
--- a/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/operator_method_not_found.dart.strong.transformed.expect
@@ -88,115 +88,115 @@ library;
 //   print(foo ~ 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   print(foo < 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '>' operator.
 //   print(foo > 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '<=' operator.
 //   print(foo <= 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '>=' operator.
 //   print(foo >= 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '-' operator.
 //   print(foo - 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //   print(foo + 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '/' operator.
 //   print(foo / 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '~/' operator.
 //   print(foo ~/ 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '*' operator.
 //   print(foo * 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '%' operator.
 //   print(foo % 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '|' operator.
 //   print(foo | 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '^' operator.
 //   print(foo ^ 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '&' operator.
 //   print(foo & 2);
 //             ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '<<' operator.
 //   print(foo << 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '>>' operator.
 //   print(foo >> 2);
 //             ^^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //   print(foo[2] = 2);
 //            ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //   print(foo[2]);
 //            ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a '~' operator.
 //   print(~foo);
 //         ^
 //
-// pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the type 'Foo'.
 //  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 //   print(-foo);
@@ -212,98 +212,98 @@ class Foo extends core::Object {
 }
 static method main() → dynamic {
   self::Foo foo = new self::Foo::•();
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:12:13: Error: The operator '<' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   print(foo < 2);
             ^" in foo{<unresolved>}.<(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:13:13: Error: The operator '>' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '>' operator.
   print(foo > 2);
             ^" in foo{<unresolved>}.>(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:14:13: Error: The operator '<=' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '<=' operator.
   print(foo <= 2);
             ^^" in foo{<unresolved>}.<=(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:15:13: Error: The operator '>=' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '>=' operator.
   print(foo >= 2);
             ^^" in foo{<unresolved>}.>=(2));
   core::print(foo =={core::Object::==}{(core::Object) → core::bool} 2);
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:17:13: Error: The operator '-' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '-' operator.
   print(foo - 2);
             ^" in foo{<unresolved>}.-(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:18:13: Error: The operator '+' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
   print(foo + 2);
             ^" in foo{<unresolved>}.+(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:19:13: Error: The operator '/' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '/' operator.
   print(foo / 2);
             ^" in foo{<unresolved>}./(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:20:13: Error: The operator '~/' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '~/' operator.
   print(foo ~/ 2);
             ^^" in foo{<unresolved>}.~/(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:21:13: Error: The operator '*' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '*' operator.
   print(foo * 2);
             ^" in foo{<unresolved>}.*(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:22:13: Error: The operator '%' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '%' operator.
   print(foo % 2);
             ^" in foo{<unresolved>}.%(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:23:13: Error: The operator '|' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '|' operator.
   print(foo | 2);
             ^" in foo{<unresolved>}.|(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:24:13: Error: The operator '^' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '^' operator.
   print(foo ^ 2);
             ^" in foo{<unresolved>}.^(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:25:13: Error: The operator '&' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '&' operator.
   print(foo & 2);
             ^" in foo{<unresolved>}.&(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:26:13: Error: The operator '<<' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '<<' operator.
   print(foo << 2);
             ^^" in foo{<unresolved>}.<<(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:27:13: Error: The operator '>>' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '>>' operator.
   print(foo >> 2);
             ^^" in foo{<unresolved>}.>>(2));
-  core::print(let final self::Foo #t1 = foo in let final core::int #t2 = 2 in let final core::int #t3 = 2 in let final void #t4 = invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the class 'Foo'.
+  core::print(let final self::Foo #t1 = foo in let final core::int #t2 = 2 in let final core::int #t3 = 2 in let final void #t4 = invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:29:12: Error: The operator '[]=' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
   print(foo[2] = 2);
            ^" in #t1{<unresolved>}.[]=(#t2, #t3) in #t3);
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:30:12: Error: The operator '[]' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
   print(foo[2]);
            ^" in foo{<unresolved>}.[](2));
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:31:9: Error: The operator '~' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a '~' operator.
   print(~foo);
         ^" in foo{<unresolved>}.~());
-  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/general/operator_method_not_found.dart:32:9: Error: The operator 'unary-' isn't defined for the type 'Foo'.
  - 'Foo' is from 'pkg/front_end/testcases/general/operator_method_not_found.dart'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
   print(-foo);
diff --git a/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.expect b/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.expect
index cc72ed97513..e7f5535421b 100644
--- a/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.expect
+++ b/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.expect
@@ -2,55 +2,55 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_namedExtensionPrivateMethod'.
 //   c._namedExtensionPrivateMethod(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unnamedExtensionMethod'.
 //   c.unnamedExtensionMethod(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_unnamedExtensionPrivateMethod'.
 //   c._unnamedExtensionPrivateMethod(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod1'.
 //   c._namedInjectedExtensionPrivateMethod1(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod1'.
 //   c.unnamedInjectedExtensionMethod1(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod1'.
 //   c._unnamedInjectedExtensionPrivateMethod1(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod2'.
 //   c._namedInjectedExtensionPrivateMethod2(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod2'.
 //   c.unnamedInjectedExtensionMethod2(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod2'.
 //   c._unnamedInjectedExtensionPrivateMethod2(); // Error
@@ -62,47 +62,47 @@ import "dart:test" as test;
 import "dart:test";
 
 static method test(test::Class c) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_namedExtensionPrivateMethod'.
   c._namedExtensionPrivateMethod(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._namedExtensionPrivateMethod();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named 'unnamedExtensionMethod'.
   c.unnamedExtensionMethod(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.unnamedExtensionMethod();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_unnamedExtensionPrivateMethod'.
   c._unnamedExtensionPrivateMethod(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._unnamedExtensionPrivateMethod();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod1'.
   c._namedInjectedExtensionPrivateMethod1(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._namedInjectedExtensionPrivateMethod1();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod1'.
   c.unnamedInjectedExtensionMethod1(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.unnamedInjectedExtensionMethod1();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod1'.
   c._unnamedInjectedExtensionPrivateMethod1(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._unnamedInjectedExtensionPrivateMethod1();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod2'.
   c._namedInjectedExtensionPrivateMethod2(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._namedInjectedExtensionPrivateMethod2();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod2'.
   c.unnamedInjectedExtensionMethod2(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.unnamedInjectedExtensionMethod2();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod2'.
   c._unnamedInjectedExtensionPrivateMethod2(); // Error
diff --git a/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.modular.expect b/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.modular.expect
index cc72ed97513..e7f5535421b 100644
--- a/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.modular.expect
@@ -2,55 +2,55 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_namedExtensionPrivateMethod'.
 //   c._namedExtensionPrivateMethod(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unnamedExtensionMethod'.
 //   c.unnamedExtensionMethod(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_unnamedExtensionPrivateMethod'.
 //   c._unnamedExtensionPrivateMethod(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod1'.
 //   c._namedInjectedExtensionPrivateMethod1(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod1'.
 //   c.unnamedInjectedExtensionMethod1(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod1'.
 //   c._unnamedInjectedExtensionPrivateMethod1(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod2'.
 //   c._namedInjectedExtensionPrivateMethod2(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod2'.
 //   c.unnamedInjectedExtensionMethod2(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod2'.
 //   c._unnamedInjectedExtensionPrivateMethod2(); // Error
@@ -62,47 +62,47 @@ import "dart:test" as test;
 import "dart:test";
 
 static method test(test::Class c) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_namedExtensionPrivateMethod'.
   c._namedExtensionPrivateMethod(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._namedExtensionPrivateMethod();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named 'unnamedExtensionMethod'.
   c.unnamedExtensionMethod(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.unnamedExtensionMethod();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_unnamedExtensionPrivateMethod'.
   c._unnamedExtensionPrivateMethod(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._unnamedExtensionPrivateMethod();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod1'.
   c._namedInjectedExtensionPrivateMethod1(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._namedInjectedExtensionPrivateMethod1();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod1'.
   c.unnamedInjectedExtensionMethod1(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.unnamedInjectedExtensionMethod1();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod1'.
   c._unnamedInjectedExtensionPrivateMethod1(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._unnamedInjectedExtensionPrivateMethod1();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod2'.
   c._namedInjectedExtensionPrivateMethod2(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._namedInjectedExtensionPrivateMethod2();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod2'.
   c.unnamedInjectedExtensionMethod2(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.unnamedInjectedExtensionMethod2();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod2'.
   c._unnamedInjectedExtensionPrivateMethod2(); // Error
diff --git a/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.transformed.expect
index cc72ed97513..e7f5535421b 100644
--- a/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.transformed.expect
@@ -2,55 +2,55 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_namedExtensionPrivateMethod'.
 //   c._namedExtensionPrivateMethod(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unnamedExtensionMethod'.
 //   c.unnamedExtensionMethod(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_unnamedExtensionPrivateMethod'.
 //   c._unnamedExtensionPrivateMethod(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod1'.
 //   c._namedInjectedExtensionPrivateMethod1(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod1'.
 //   c.unnamedInjectedExtensionMethod1(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod1'.
 //   c._unnamedInjectedExtensionPrivateMethod1(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod2'.
 //   c._namedInjectedExtensionPrivateMethod2(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod2'.
 //   c.unnamedInjectedExtensionMethod2(); // Error
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'dart:test'.
 // Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod2'.
 //   c._unnamedInjectedExtensionPrivateMethod2(); // Error
@@ -62,47 +62,47 @@ import "dart:test" as test;
 import "dart:test";
 
 static method test(test::Class c) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:8:5: Error: The method '_namedExtensionPrivateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_namedExtensionPrivateMethod'.
   c._namedExtensionPrivateMethod(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._namedExtensionPrivateMethod();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:9:5: Error: The method 'unnamedExtensionMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named 'unnamedExtensionMethod'.
   c.unnamedExtensionMethod(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.unnamedExtensionMethod();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:10:5: Error: The method '_unnamedExtensionPrivateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_unnamedExtensionPrivateMethod'.
   c._unnamedExtensionPrivateMethod(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._unnamedExtensionPrivateMethod();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:12:5: Error: The method '_namedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod1'.
   c._namedInjectedExtensionPrivateMethod1(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._namedInjectedExtensionPrivateMethod1();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:13:5: Error: The method 'unnamedInjectedExtensionMethod1' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod1'.
   c.unnamedInjectedExtensionMethod1(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.unnamedInjectedExtensionMethod1();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:14:5: Error: The method '_unnamedInjectedExtensionPrivateMethod1' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod1'.
   c._unnamedInjectedExtensionPrivateMethod1(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._unnamedInjectedExtensionPrivateMethod1();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:16:5: Error: The method '_namedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_namedInjectedExtensionPrivateMethod2'.
   c._namedInjectedExtensionPrivateMethod2(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}._namedInjectedExtensionPrivateMethod2();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:17:5: Error: The method 'unnamedInjectedExtensionMethod2' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named 'unnamedInjectedExtensionMethod2'.
   c.unnamedInjectedExtensionMethod2(); // Error
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.unnamedInjectedExtensionMethod2();
-  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/patch_extension_scope/main.dart:18:5: Error: The method '_unnamedInjectedExtensionPrivateMethod2' isn't defined for the type 'Class'.
  - 'Class' is from 'dart:test'.
 Try correcting the name to the name of an existing method, or defining a method named '_unnamedInjectedExtensionPrivateMethod2'.
   c._unnamedInjectedExtensionPrivateMethod2(); // Error
diff --git a/pkg/front_end/testcases/general/private_member_access.dart.strong.expect b/pkg/front_end/testcases/general/private_member_access.dart.strong.expect
index 9dd0c003511..7cf46394a93 100644
--- a/pkg/front_end/testcases/general/private_member_access.dart.strong.expect
+++ b/pkg/front_end/testcases/general/private_member_access.dart.strong.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
 //   c._privateField;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
 //   c._privateField = 42;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateMethod'.
 //   c._privateMethod;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod'.
 //   c._privateMethod();
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
 //   c._privateField += 42;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
 //   c._privateField += 42;
@@ -44,31 +44,31 @@ import "private_member_access_lib.dart" as pri;
 import "org-dartlang-testcase:///private_member_access_lib.dart";
 
 static method method(pri::Class c) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
   c._privateField;
     ^^^^^^^^^^^^^" in c{<unresolved>}._privateField;
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
   c._privateField = 42;
     ^^^^^^^^^^^^^" in c.{<unresolved>}_privateField = 42;
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateMethod'.
   c._privateMethod;
     ^^^^^^^^^^^^^^" in c{<unresolved>}._privateMethod;
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod'.
   c._privateMethod();
     ^^^^^^^^^^^^^^" in c{<unresolved>}._privateMethod();
-  let final pri::Class #t1 = c in invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+  let final pri::Class #t1 = c in invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
   c._privateField += 42;
-    ^^^^^^^^^^^^^" in #t1.{<unresolved>}_privateField = invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+    ^^^^^^^^^^^^^" in #t1.{<unresolved>}_privateField = invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
   c._privateField += 42;
diff --git a/pkg/front_end/testcases/general/private_member_access.dart.strong.modular.expect b/pkg/front_end/testcases/general/private_member_access.dart.strong.modular.expect
index 9dd0c003511..7cf46394a93 100644
--- a/pkg/front_end/testcases/general/private_member_access.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/private_member_access.dart.strong.modular.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
 //   c._privateField;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
 //   c._privateField = 42;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateMethod'.
 //   c._privateMethod;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod'.
 //   c._privateMethod();
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
 //   c._privateField += 42;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
 //   c._privateField += 42;
@@ -44,31 +44,31 @@ import "private_member_access_lib.dart" as pri;
 import "org-dartlang-testcase:///private_member_access_lib.dart";
 
 static method method(pri::Class c) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
   c._privateField;
     ^^^^^^^^^^^^^" in c{<unresolved>}._privateField;
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
   c._privateField = 42;
     ^^^^^^^^^^^^^" in c.{<unresolved>}_privateField = 42;
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateMethod'.
   c._privateMethod;
     ^^^^^^^^^^^^^^" in c{<unresolved>}._privateMethod;
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod'.
   c._privateMethod();
     ^^^^^^^^^^^^^^" in c{<unresolved>}._privateMethod();
-  let final pri::Class #t1 = c in invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+  let final pri::Class #t1 = c in invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
   c._privateField += 42;
-    ^^^^^^^^^^^^^" in #t1.{<unresolved>}_privateField = invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+    ^^^^^^^^^^^^^" in #t1.{<unresolved>}_privateField = invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
   c._privateField += 42;
diff --git a/pkg/front_end/testcases/general/private_member_access.dart.strong.transformed.expect b/pkg/front_end/testcases/general/private_member_access.dart.strong.transformed.expect
index 9dd0c003511..7cf46394a93 100644
--- a/pkg/front_end/testcases/general/private_member_access.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/private_member_access.dart.strong.transformed.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
 //   c._privateField;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
 //   c._privateField = 42;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateMethod'.
 //   c._privateMethod;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '_privateMethod'.
 //   c._privateMethod();
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
 //   c._privateField += 42;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
 //   c._privateField += 42;
@@ -44,31 +44,31 @@ import "private_member_access_lib.dart" as pri;
 import "org-dartlang-testcase:///private_member_access_lib.dart";
 
 static method method(pri::Class c) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:8:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
   c._privateField;
     ^^^^^^^^^^^^^" in c{<unresolved>}._privateField;
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:9:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
   c._privateField = 42;
     ^^^^^^^^^^^^^" in c.{<unresolved>}_privateField = 42;
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:10:5: Error: The getter '_privateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateMethod'.
   c._privateMethod;
     ^^^^^^^^^^^^^^" in c{<unresolved>}._privateMethod;
-  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:11:5: Error: The method '_privateMethod' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '_privateMethod'.
   c._privateMethod();
     ^^^^^^^^^^^^^^" in c{<unresolved>}._privateMethod();
-  let final pri::Class #t1 = c in invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the class 'Class'.
+  let final pri::Class #t1 = c in invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The setter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named '_privateField'.
   c._privateField += 42;
-    ^^^^^^^^^^^^^" in #t1.{<unresolved>}_privateField = invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the class 'Class'.
+    ^^^^^^^^^^^^^" in #t1.{<unresolved>}_privateField = invalid-expression "pkg/front_end/testcases/general/private_member_access.dart:12:5: Error: The getter '_privateField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/general/private_member_access_lib.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_privateField'.
   c._privateField += 42;
diff --git a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.expect b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.expect
index 652fc7cf1f4..228e45f8411 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.expect
@@ -22,51 +22,51 @@ library;
 //     super + new Class1();
 //           ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 //     -new Class1();
 //     ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the class 'String'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the type 'String'.
 // Try correcting the operator to an existing operator, or defining a '-' operator.
 //     ('' + '') - new Class1();
 //               ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the type 'int'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //     (0 + 1)[0] = new Class1();
 //            ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the class 'Class2'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the type 'Class2'.
 //  - 'Class2' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //     _c2[0] = new Class1();
 //        ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the type 'int'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //     (0 + 1)[new Class1()];
 //            ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'foo'.
 //     new Class1().foo;
 //                  ^^^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
 //     (0 + 1).foo = new Class1();
 //             ^^^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //     new Class1().foo();
 //                  ^^^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     new Class1()();
@@ -113,43 +113,43 @@ class Class2 extends self::Class1 {
   final field self::Class2 _c2;
   constructor •(self::Class2 _c2) → self::Class2
     : self::Class2::_c2 = _c2, super self::Class1::_() {
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
     -new Class1();
     ^" in new self::Class1::_(){<unresolved>}.unary-();
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the class 'String'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the type 'String'.
 Try correcting the operator to an existing operator, or defining a '-' operator.
     ('' + '') - new Class1();
               ^" in "".{core::String::+}(""){(core::String) → core::String}{<unresolved>}.-(new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the type 'int'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
     (0 + 1)[0] = new Class1();
            ^" in 0.{core::num::+}(1){(core::num) → core::int}{<unresolved>}.[]=(0, new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the class 'Class2'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the type 'Class2'.
  - 'Class2' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
     _c2[0] = new Class1();
        ^" in this.{self::Class2::_c2}{self::Class2}{<unresolved>}.[]=(0, new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the type 'int'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
     (0 + 1)[new Class1()];
            ^" in 0.{core::num::+}(1){(core::num) → core::int}{<unresolved>}.[](new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'foo'.
     new Class1().foo;
                  ^^^" in new self::Class1::_(){<unresolved>}.foo;
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
     (0 + 1).foo = new Class1();
             ^^^" in 0.{core::num::+}(1){(core::num) → core::int}.{<unresolved>}foo = new self::Class1::_();
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
     new Class1().foo();
                  ^^^" in new self::Class1::_(){<unresolved>}.foo();
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     new Class1()();
diff --git a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.modular.expect b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.modular.expect
index 652fc7cf1f4..228e45f8411 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.modular.expect
@@ -22,51 +22,51 @@ library;
 //     super + new Class1();
 //           ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 //     -new Class1();
 //     ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the class 'String'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the type 'String'.
 // Try correcting the operator to an existing operator, or defining a '-' operator.
 //     ('' + '') - new Class1();
 //               ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the type 'int'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //     (0 + 1)[0] = new Class1();
 //            ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the class 'Class2'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the type 'Class2'.
 //  - 'Class2' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //     _c2[0] = new Class1();
 //        ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the type 'int'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //     (0 + 1)[new Class1()];
 //            ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'foo'.
 //     new Class1().foo;
 //                  ^^^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
 //     (0 + 1).foo = new Class1();
 //             ^^^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //     new Class1().foo();
 //                  ^^^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     new Class1()();
@@ -113,43 +113,43 @@ class Class2 extends self::Class1 {
   final field self::Class2 _c2;
   constructor •(self::Class2 _c2) → self::Class2
     : self::Class2::_c2 = _c2, super self::Class1::_() {
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
     -new Class1();
     ^" in new self::Class1::_(){<unresolved>}.unary-();
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the class 'String'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the type 'String'.
 Try correcting the operator to an existing operator, or defining a '-' operator.
     ('' + '') - new Class1();
               ^" in "".{core::String::+}(""){(core::String) → core::String}{<unresolved>}.-(new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the type 'int'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
     (0 + 1)[0] = new Class1();
            ^" in 0.{core::num::+}(1){(core::num) → core::int}{<unresolved>}.[]=(0, new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the class 'Class2'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the type 'Class2'.
  - 'Class2' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
     _c2[0] = new Class1();
        ^" in this.{self::Class2::_c2}{self::Class2}{<unresolved>}.[]=(0, new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the type 'int'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
     (0 + 1)[new Class1()];
            ^" in 0.{core::num::+}(1){(core::num) → core::int}{<unresolved>}.[](new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'foo'.
     new Class1().foo;
                  ^^^" in new self::Class1::_(){<unresolved>}.foo;
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
     (0 + 1).foo = new Class1();
             ^^^" in 0.{core::num::+}(1){(core::num) → core::int}.{<unresolved>}foo = new self::Class1::_();
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
     new Class1().foo();
                  ^^^" in new self::Class1::_(){<unresolved>}.foo();
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     new Class1()();
diff --git a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.transformed.expect b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.transformed.expect
index 652fc7cf1f4..228e45f8411 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.strong.transformed.expect
@@ -22,51 +22,51 @@ library;
 //     super + new Class1();
 //           ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 //     -new Class1();
 //     ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the class 'String'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the type 'String'.
 // Try correcting the operator to an existing operator, or defining a '-' operator.
 //     ('' + '') - new Class1();
 //               ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the type 'int'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //     (0 + 1)[0] = new Class1();
 //            ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the class 'Class2'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the type 'Class2'.
 //  - 'Class2' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //     _c2[0] = new Class1();
 //        ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the type 'int'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //     (0 + 1)[new Class1()];
 //            ^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'foo'.
 //     new Class1().foo;
 //                  ^^^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the class 'int'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
 //     (0 + 1).foo = new Class1();
 //             ^^^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //     new Class1().foo();
 //                  ^^^
 //
-// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     new Class1()();
@@ -113,43 +113,43 @@ class Class2 extends self::Class1 {
   final field self::Class2 _c2;
   constructor •(self::Class2 _c2) → self::Class2
     : self::Class2::_c2 = _c2, super self::Class1::_() {
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:20:5: Error: The operator 'unary-' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
     -new Class1();
     ^" in new self::Class1::_(){<unresolved>}.unary-();
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the class 'String'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:22:15: Error: The operator '-' isn't defined for the type 'String'.
 Try correcting the operator to an existing operator, or defining a '-' operator.
     ('' + '') - new Class1();
               ^" in "".{core::String::+}(""){(core::String) → core::String}{<unresolved>}.-(new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:24:12: Error: The operator '[]=' isn't defined for the type 'int'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
     (0 + 1)[0] = new Class1();
            ^" in 0.{core::num::+}(1){(core::num) → core::int}{<unresolved>}.[]=(0, new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the class 'Class2'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:25:8: Error: The operator '[]=' isn't defined for the type 'Class2'.
  - 'Class2' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
     _c2[0] = new Class1();
        ^" in this.{self::Class2::_c2}{self::Class2}{<unresolved>}.[]=(0, new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:27:12: Error: The operator '[]' isn't defined for the type 'int'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
     (0 + 1)[new Class1()];
            ^" in 0.{core::num::+}(1){(core::num) → core::int}{<unresolved>}.[](new self::Class1::_());
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:29:18: Error: The getter 'foo' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'foo'.
     new Class1().foo;
                  ^^^" in new self::Class1::_(){<unresolved>}.foo;
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:31:13: Error: The setter 'foo' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
     (0 + 1).foo = new Class1();
             ^^^" in 0.{core::num::+}(1){(core::num) → core::int}.{<unresolved>}foo = new self::Class1::_();
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:33:18: Error: The method 'foo' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
     new Class1().foo();
                  ^^^" in new self::Class1::_(){<unresolved>}.foo();
-    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the class 'Class1'.
+    invalid-expression "pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart:35:17: Error: The method 'call' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     new Class1()();
diff --git a/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.expect b/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.expect
index 0c49e8ad3ce..491056fefaa 100644
--- a/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.expect
+++ b/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the class 'num'.
+// pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the type 'num'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'length'.
 //   num method2() => field1 + field2.length;
 //                                    ^^^^^^
@@ -28,7 +28,7 @@ class NumClass<T extends core::num, S extends self::NumClass::T = core::num> ext
   method method1() → core::num
     return this.{self::NumClass::field1}{self::NumClass::T}.{core::num::*}(this.{self::NumClass::field2}{self::NumClass::S}){(core::num) → core::num};
   method method2() → core::num
-    return this.{self::NumClass::field1}{self::NumClass::T}.{core::num::+}(invalid-expression "pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the class 'num'.
+    return this.{self::NumClass::field1}{self::NumClass::T}.{core::num::+}(invalid-expression "pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the type 'num'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'length'.
   num method2() => field1 + field2.length;
                                    ^^^^^^" in this.{self::NumClass::field2}{self::NumClass::S}{<unresolved>}.length as{TypeError,ForDynamic} core::num){(core::num) → core::num};
diff --git a/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.modular.expect b/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.modular.expect
index 0c49e8ad3ce..491056fefaa 100644
--- a/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the class 'num'.
+// pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the type 'num'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'length'.
 //   num method2() => field1 + field2.length;
 //                                    ^^^^^^
@@ -28,7 +28,7 @@ class NumClass<T extends core::num, S extends self::NumClass::T = core::num> ext
   method method1() → core::num
     return this.{self::NumClass::field1}{self::NumClass::T}.{core::num::*}(this.{self::NumClass::field2}{self::NumClass::S}){(core::num) → core::num};
   method method2() → core::num
-    return this.{self::NumClass::field1}{self::NumClass::T}.{core::num::+}(invalid-expression "pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the class 'num'.
+    return this.{self::NumClass::field1}{self::NumClass::T}.{core::num::+}(invalid-expression "pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the type 'num'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'length'.
   num method2() => field1 + field2.length;
                                    ^^^^^^" in this.{self::NumClass::field2}{self::NumClass::S}{<unresolved>}.length as{TypeError,ForDynamic} core::num){(core::num) → core::num};
diff --git a/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.transformed.expect b/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.transformed.expect
index 5c7235021b4..e3fcf8da942 100644
--- a/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/type_variable_bound_access.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the class 'num'.
+// pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the type 'num'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'length'.
 //   num method2() => field1 + field2.length;
 //                                    ^^^^^^
@@ -28,7 +28,7 @@ class NumClass<T extends core::num, S extends self::NumClass::T = core::num> ext
   method method1() → core::num
     return this.{self::NumClass::field1}{self::NumClass::T}.{core::num::*}(this.{self::NumClass::field2}{self::NumClass::S}){(core::num) → core::num};
   method method2() → core::num
-    return this.{self::NumClass::field1}{self::NumClass::T}.{core::num::+}(invalid-expression "pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the class 'num'.
+    return this.{self::NumClass::field1}{self::NumClass::T}.{core::num::+}(invalid-expression "pkg/front_end/testcases/general/type_variable_bound_access.dart:22:36: Error: The getter 'length' isn't defined for the type 'num'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'length'.
   num method2() => field1 + field2.length;
                                    ^^^^^^" in this.{self::NumClass::field2}{self::NumClass::S}{<unresolved>}.length as{TypeError,ForDynamic,Unchecked} core::num){(core::num) → core::num};
diff --git a/pkg/front_end/testcases/general/undefined.dart.strong.expect b/pkg/front_end/testcases/general/undefined.dart.strong.expect
index a983cb547c9..a7812d1366a 100644
--- a/pkg/front_end/testcases/general/undefined.dart.strong.expect
+++ b/pkg/front_end/testcases/general/undefined.dart.strong.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'y'.
 //   c.y;
 //     ^
 //
-// pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'g'.
 //   c.g();
 //     ^
 //
-// pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'y'.
 //   c.y = null;
@@ -32,19 +32,19 @@ class C extends core::Object {
 }
 static method test(self::C c) → void {
   c.{self::C::x}{dynamic};
-  invalid-expression "pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'y'.
   c.y;
     ^" in c{<unresolved>}.y;
   c.{self::C::f}(){() → void};
-  invalid-expression "pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'g'.
   c.g();
     ^" in c{<unresolved>}.g();
   c.{self::C::x} = null;
-  invalid-expression "pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'y'.
   c.y = null;
diff --git a/pkg/front_end/testcases/general/undefined.dart.strong.modular.expect b/pkg/front_end/testcases/general/undefined.dart.strong.modular.expect
index a983cb547c9..a7812d1366a 100644
--- a/pkg/front_end/testcases/general/undefined.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/undefined.dart.strong.modular.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'y'.
 //   c.y;
 //     ^
 //
-// pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'g'.
 //   c.g();
 //     ^
 //
-// pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'y'.
 //   c.y = null;
@@ -32,19 +32,19 @@ class C extends core::Object {
 }
 static method test(self::C c) → void {
   c.{self::C::x}{dynamic};
-  invalid-expression "pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'y'.
   c.y;
     ^" in c{<unresolved>}.y;
   c.{self::C::f}(){() → void};
-  invalid-expression "pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'g'.
   c.g();
     ^" in c{<unresolved>}.g();
   c.{self::C::x} = null;
-  invalid-expression "pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'y'.
   c.y = null;
diff --git a/pkg/front_end/testcases/general/undefined.dart.strong.transformed.expect b/pkg/front_end/testcases/general/undefined.dart.strong.transformed.expect
index a983cb547c9..a7812d1366a 100644
--- a/pkg/front_end/testcases/general/undefined.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/undefined.dart.strong.transformed.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'y'.
 //   c.y;
 //     ^
 //
-// pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'g'.
 //   c.g();
 //     ^
 //
-// pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'y'.
 //   c.y = null;
@@ -32,19 +32,19 @@ class C extends core::Object {
 }
 static method test(self::C c) → void {
   c.{self::C::x}{dynamic};
-  invalid-expression "pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/general/undefined.dart:12:5: Error: The getter 'y' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'y'.
   c.y;
     ^" in c{<unresolved>}.y;
   c.{self::C::f}(){() → void};
-  invalid-expression "pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/general/undefined.dart:14:5: Error: The method 'g' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'g'.
   c.g();
     ^" in c{<unresolved>}.g();
   c.{self::C::x} = null;
-  invalid-expression "pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/general/undefined.dart:16:5: Error: The setter 'y' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'y'.
   c.y = null;
diff --git a/pkg/front_end/testcases/general/undefined_access.dart b/pkg/front_end/testcases/general/undefined_access.dart
new file mode 100644
index 00000000000..e6bd80cf868
--- /dev/null
+++ b/pkg/front_end/testcases/general/undefined_access.dart
@@ -0,0 +1,10 @@
+// Copyright (c) 2025, the Dart project authors.  Please see the AUTHORS file
+// 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.
+
+method((int,) r) {
+  r.getter;
+  r.setter = 0;
+  r.method();
+  r + 0;
+}
diff --git a/pkg/front_end/testcases/general/undefined_access.dart.strong.expect b/pkg/front_end/testcases/general/undefined_access.dart.strong.expect
new file mode 100644
index 00000000000..f4a9deb0d77
--- /dev/null
+++ b/pkg/front_end/testcases/general/undefined_access.dart.strong.expect
@@ -0,0 +1,45 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/undefined_access.dart:6:5: Error: The getter 'getter' isn't defined for the type '(int)'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'getter'.
+//   r.getter;
+//     ^^^^^^
+//
+// pkg/front_end/testcases/general/undefined_access.dart:7:5: Error: The setter 'setter' isn't defined for the type '(int)'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
+//   r.setter = 0;
+//     ^^^^^^
+//
+// pkg/front_end/testcases/general/undefined_access.dart:8:5: Error: The method 'method' isn't defined for the type '(int)'.
+// Try correcting the name to the name of an existing method, or defining a method named 'method'.
+//   r.method();
+//     ^^^^^^
+//
+// pkg/front_end/testcases/general/undefined_access.dart:9:5: Error: The operator '+' isn't defined for the type '(int)'.
+// Try correcting the operator to an existing operator, or defining a '+' operator.
+//   r + 0;
+//     ^
+//
+import self as self;
+import "dart:core" as core;
+
+static method method((core::int) r) → dynamic {
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:6:5: Error: The getter 'getter' isn't defined for the type '(int)'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'getter'.
+  r.getter;
+    ^^^^^^" in r{<unresolved>}.getter;
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:7:5: Error: The setter 'setter' isn't defined for the type '(int)'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
+  r.setter = 0;
+    ^^^^^^" in r.{<unresolved>}setter = 0;
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:8:5: Error: The method 'method' isn't defined for the type '(int)'.
+Try correcting the name to the name of an existing method, or defining a method named 'method'.
+  r.method();
+    ^^^^^^" in r{<unresolved>}.method();
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:9:5: Error: The operator '+' isn't defined for the type '(int)'.
+Try correcting the operator to an existing operator, or defining a '+' operator.
+  r + 0;
+    ^" in r{<unresolved>}.+(0);
+}
diff --git a/pkg/front_end/testcases/general/undefined_access.dart.strong.modular.expect b/pkg/front_end/testcases/general/undefined_access.dart.strong.modular.expect
new file mode 100644
index 00000000000..f4a9deb0d77
--- /dev/null
+++ b/pkg/front_end/testcases/general/undefined_access.dart.strong.modular.expect
@@ -0,0 +1,45 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/undefined_access.dart:6:5: Error: The getter 'getter' isn't defined for the type '(int)'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'getter'.
+//   r.getter;
+//     ^^^^^^
+//
+// pkg/front_end/testcases/general/undefined_access.dart:7:5: Error: The setter 'setter' isn't defined for the type '(int)'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
+//   r.setter = 0;
+//     ^^^^^^
+//
+// pkg/front_end/testcases/general/undefined_access.dart:8:5: Error: The method 'method' isn't defined for the type '(int)'.
+// Try correcting the name to the name of an existing method, or defining a method named 'method'.
+//   r.method();
+//     ^^^^^^
+//
+// pkg/front_end/testcases/general/undefined_access.dart:9:5: Error: The operator '+' isn't defined for the type '(int)'.
+// Try correcting the operator to an existing operator, or defining a '+' operator.
+//   r + 0;
+//     ^
+//
+import self as self;
+import "dart:core" as core;
+
+static method method((core::int) r) → dynamic {
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:6:5: Error: The getter 'getter' isn't defined for the type '(int)'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'getter'.
+  r.getter;
+    ^^^^^^" in r{<unresolved>}.getter;
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:7:5: Error: The setter 'setter' isn't defined for the type '(int)'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
+  r.setter = 0;
+    ^^^^^^" in r.{<unresolved>}setter = 0;
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:8:5: Error: The method 'method' isn't defined for the type '(int)'.
+Try correcting the name to the name of an existing method, or defining a method named 'method'.
+  r.method();
+    ^^^^^^" in r{<unresolved>}.method();
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:9:5: Error: The operator '+' isn't defined for the type '(int)'.
+Try correcting the operator to an existing operator, or defining a '+' operator.
+  r + 0;
+    ^" in r{<unresolved>}.+(0);
+}
diff --git a/pkg/front_end/testcases/general/undefined_access.dart.strong.outline.expect b/pkg/front_end/testcases/general/undefined_access.dart.strong.outline.expect
new file mode 100644
index 00000000000..1d1dce35740
--- /dev/null
+++ b/pkg/front_end/testcases/general/undefined_access.dart.strong.outline.expect
@@ -0,0 +1,6 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+static method method((core::int) r) → dynamic
+  ;
diff --git a/pkg/front_end/testcases/general/undefined_access.dart.strong.transformed.expect b/pkg/front_end/testcases/general/undefined_access.dart.strong.transformed.expect
new file mode 100644
index 00000000000..f4a9deb0d77
--- /dev/null
+++ b/pkg/front_end/testcases/general/undefined_access.dart.strong.transformed.expect
@@ -0,0 +1,45 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/undefined_access.dart:6:5: Error: The getter 'getter' isn't defined for the type '(int)'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'getter'.
+//   r.getter;
+//     ^^^^^^
+//
+// pkg/front_end/testcases/general/undefined_access.dart:7:5: Error: The setter 'setter' isn't defined for the type '(int)'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
+//   r.setter = 0;
+//     ^^^^^^
+//
+// pkg/front_end/testcases/general/undefined_access.dart:8:5: Error: The method 'method' isn't defined for the type '(int)'.
+// Try correcting the name to the name of an existing method, or defining a method named 'method'.
+//   r.method();
+//     ^^^^^^
+//
+// pkg/front_end/testcases/general/undefined_access.dart:9:5: Error: The operator '+' isn't defined for the type '(int)'.
+// Try correcting the operator to an existing operator, or defining a '+' operator.
+//   r + 0;
+//     ^
+//
+import self as self;
+import "dart:core" as core;
+
+static method method((core::int) r) → dynamic {
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:6:5: Error: The getter 'getter' isn't defined for the type '(int)'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'getter'.
+  r.getter;
+    ^^^^^^" in r{<unresolved>}.getter;
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:7:5: Error: The setter 'setter' isn't defined for the type '(int)'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
+  r.setter = 0;
+    ^^^^^^" in r.{<unresolved>}setter = 0;
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:8:5: Error: The method 'method' isn't defined for the type '(int)'.
+Try correcting the name to the name of an existing method, or defining a method named 'method'.
+  r.method();
+    ^^^^^^" in r{<unresolved>}.method();
+  invalid-expression "pkg/front_end/testcases/general/undefined_access.dart:9:5: Error: The operator '+' isn't defined for the type '(int)'.
+Try correcting the operator to an existing operator, or defining a '+' operator.
+  r + 0;
+    ^" in r{<unresolved>}.+(0);
+}
diff --git a/pkg/front_end/testcases/general/undefined_access.dart.textual_outline.expect b/pkg/front_end/testcases/general/undefined_access.dart.textual_outline.expect
new file mode 100644
index 00000000000..18b2dd7af92
--- /dev/null
+++ b/pkg/front_end/testcases/general/undefined_access.dart.textual_outline.expect
@@ -0,0 +1 @@
+method((int,) r) {}
diff --git a/pkg/front_end/testcases/general/undefined_access.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general/undefined_access.dart.textual_outline_modelled.expect
new file mode 100644
index 00000000000..18b2dd7af92
--- /dev/null
+++ b/pkg/front_end/testcases/general/undefined_access.dart.textual_outline_modelled.expect
@@ -0,0 +1 @@
+method((int,) r) {}
diff --git a/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.expect b/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.expect
index 29efdbedf5d..a5aa81394fe 100644
--- a/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.expect
+++ b/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
 //   c.x += 1;
 //     ^
 //
-// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
 //   c.x ??= 1;
@@ -25,12 +25,12 @@ class C extends core::Object {
 }
 static method test(self::C c) → void {
   c.{self::C::x} = 1;
-  let final self::C #t1 = c in #t1.{self::C::x} = invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the class 'C'.
+  let final self::C #t1 = c in #t1.{self::C::x} = invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
   c.x += 1;
     ^" in #t1{<unresolved>}.x{dynamic}.+(1);
-  let final self::C #t2 = c in invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the class 'C'.
+  let final self::C #t2 = c in invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
   c.x ??= 1;
diff --git a/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.modular.expect b/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.modular.expect
index 29efdbedf5d..a5aa81394fe 100644
--- a/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.modular.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
 //   c.x += 1;
 //     ^
 //
-// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
 //   c.x ??= 1;
@@ -25,12 +25,12 @@ class C extends core::Object {
 }
 static method test(self::C c) → void {
   c.{self::C::x} = 1;
-  let final self::C #t1 = c in #t1.{self::C::x} = invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the class 'C'.
+  let final self::C #t1 = c in #t1.{self::C::x} = invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
   c.x += 1;
     ^" in #t1{<unresolved>}.x{dynamic}.+(1);
-  let final self::C #t2 = c in invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the class 'C'.
+  let final self::C #t2 = c in invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
   c.x ??= 1;
diff --git a/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.transformed.expect b/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.transformed.expect
index 29efdbedf5d..a5aa81394fe 100644
--- a/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart.strong.transformed.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
 //   c.x += 1;
 //     ^
 //
-// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the class 'C'.
+// pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
 //   c.x ??= 1;
@@ -25,12 +25,12 @@ class C extends core::Object {
 }
 static method test(self::C c) → void {
   c.{self::C::x} = 1;
-  let final self::C #t1 = c in #t1.{self::C::x} = invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the class 'C'.
+  let final self::C #t1 = c in #t1.{self::C::x} = invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:11:5: Error: The getter 'x' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
   c.x += 1;
     ^" in #t1{<unresolved>}.x{dynamic}.+(1);
-  let final self::C #t2 = c in invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the class 'C'.
+  let final self::C #t2 = c in invalid-expression "pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart:12:5: Error: The getter 'x' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/general/undefined_getter_in_compound_assignment.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
   c.x ??= 1;
diff --git a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.expect b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.expect
index af97d8c73e0..69782591507 100644
--- a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.expect
+++ b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
 //     this.missingField;
 //          ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
 //     this.missingField = 0;
 //          ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
 //     this.missingMethod();
 //          ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
 //     missingField;
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
 //     missingField = 0;
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
 //     missingMethod();
@@ -84,32 +84,32 @@ class D extends self::C {
     this.{self::D::setterOnly} = 0;
     this.{self::D::getterOnly}{dynamic};
     this.{self::C::getterOnly} = 0;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
     this.missingField;
          ^^^^^^^^^^^^" in this{<unresolved>}.missingField;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
     this.missingField = 0;
          ^^^^^^^^^^^^" in this.{<unresolved>}missingField = 0;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
     this.missingMethod();
          ^^^^^^^^^^^^^" in this{<unresolved>}.missingMethod();
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
     missingField;
     ^^^^^^^^^^^^" in this{<unresolved>}.missingField;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
     missingField = 0;
     ^^^^^^^^^^^^" in this.{<unresolved>}missingField = 0;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
     missingMethod();
diff --git a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.modular.expect b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.modular.expect
index af97d8c73e0..69782591507 100644
--- a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.modular.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
 //     this.missingField;
 //          ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
 //     this.missingField = 0;
 //          ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
 //     this.missingMethod();
 //          ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
 //     missingField;
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
 //     missingField = 0;
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
 //     missingMethod();
@@ -84,32 +84,32 @@ class D extends self::C {
     this.{self::D::setterOnly} = 0;
     this.{self::D::getterOnly}{dynamic};
     this.{self::C::getterOnly} = 0;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
     this.missingField;
          ^^^^^^^^^^^^" in this{<unresolved>}.missingField;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
     this.missingField = 0;
          ^^^^^^^^^^^^" in this.{<unresolved>}missingField = 0;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
     this.missingMethod();
          ^^^^^^^^^^^^^" in this{<unresolved>}.missingMethod();
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
     missingField;
     ^^^^^^^^^^^^" in this{<unresolved>}.missingField;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
     missingField = 0;
     ^^^^^^^^^^^^" in this.{<unresolved>}missingField = 0;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
     missingMethod();
diff --git a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.transformed.expect b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.transformed.expect
index af97d8c73e0..69782591507 100644
--- a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.transformed.expect
@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
 //     this.missingField;
 //          ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
 //     this.missingField = 0;
 //          ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
 //     this.missingMethod();
 //          ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
 //     missingField;
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
 //     missingField = 0;
 //     ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the type 'D'.
 //  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
 //     missingMethod();
@@ -84,32 +84,32 @@ class D extends self::C {
     this.{self::D::setterOnly} = 0;
     this.{self::D::getterOnly}{dynamic};
     this.{self::C::getterOnly} = 0;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
     this.missingField;
          ^^^^^^^^^^^^" in this{<unresolved>}.missingField;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
     this.missingField = 0;
          ^^^^^^^^^^^^" in this.{<unresolved>}missingField = 0;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
     this.missingMethod();
          ^^^^^^^^^^^^^" in this{<unresolved>}.missingMethod();
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
     missingField;
     ^^^^^^^^^^^^" in this{<unresolved>}.missingField;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
     missingField = 0;
     ^^^^^^^^^^^^" in this.{<unresolved>}missingField = 0;
-    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+    invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the type 'D'.
  - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
     missingMethod();
diff --git a/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.2.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.2.expect
index c8eb81d759e..e0672a24c6f 100644
--- a/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.2.expect
+++ b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.2.expect
@@ -1,2 +1,2 @@
 method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
-  return dart.core::print(invalid-expression "org-dartlang-debug:synthetic_debug_expression:1:14: Error: The method 'parseInt' isn't defined for the class 'String'.\nTry correcting the name to the name of an existing method, or defining a method named 'parseInt'.\nprint(\"1234\".parseInt())\n             ^^^^^^^^" in "1234"{<unresolved>}.parseInt());
+  return dart.core::print(invalid-expression "org-dartlang-debug:synthetic_debug_expression:1:14: Error: The method 'parseInt' isn't defined for the type 'String'.\nTry correcting the name to the name of an existing method, or defining a method named 'parseInt'.\nprint(\"1234\".parseInt())\n             ^^^^^^^^" in "1234"{<unresolved>}.parseInt());
diff --git a/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.3.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.3.expect
index c8eb81d759e..e0672a24c6f 100644
--- a/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.3.expect
+++ b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.3.expect
@@ -1,2 +1,2 @@
 method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
-  return dart.core::print(invalid-expression "org-dartlang-debug:synthetic_debug_expression:1:14: Error: The method 'parseInt' isn't defined for the class 'String'.\nTry correcting the name to the name of an existing method, or defining a method named 'parseInt'.\nprint(\"1234\".parseInt())\n             ^^^^^^^^" in "1234"{<unresolved>}.parseInt());
+  return dart.core::print(invalid-expression "org-dartlang-debug:synthetic_debug_expression:1:14: Error: The method 'parseInt' isn't defined for the type 'String'.\nTry correcting the name to the name of an existing method, or defining a method named 'parseInt'.\nprint(\"1234\".parseInt())\n             ^^^^^^^^" in "1234"{<unresolved>}.parseInt());
diff --git a/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.2.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.2.expect
index c8eb81d759e..e0672a24c6f 100644
--- a/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.2.expect
+++ b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.2.expect
@@ -1,2 +1,2 @@
 method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
-  return dart.core::print(invalid-expression "org-dartlang-debug:synthetic_debug_expression:1:14: Error: The method 'parseInt' isn't defined for the class 'String'.\nTry correcting the name to the name of an existing method, or defining a method named 'parseInt'.\nprint(\"1234\".parseInt())\n             ^^^^^^^^" in "1234"{<unresolved>}.parseInt());
+  return dart.core::print(invalid-expression "org-dartlang-debug:synthetic_debug_expression:1:14: Error: The method 'parseInt' isn't defined for the type 'String'.\nTry correcting the name to the name of an existing method, or defining a method named 'parseInt'.\nprint(\"1234\".parseInt())\n             ^^^^^^^^" in "1234"{<unresolved>}.parseInt());
diff --git a/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.3.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.3.expect
index c8eb81d759e..e0672a24c6f 100644
--- a/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.3.expect
+++ b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.3.expect
@@ -1,2 +1,2 @@
 method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
-  return dart.core::print(invalid-expression "org-dartlang-debug:synthetic_debug_expression:1:14: Error: The method 'parseInt' isn't defined for the class 'String'.\nTry correcting the name to the name of an existing method, or defining a method named 'parseInt'.\nprint(\"1234\".parseInt())\n             ^^^^^^^^" in "1234"{<unresolved>}.parseInt());
+  return dart.core::print(invalid-expression "org-dartlang-debug:synthetic_debug_expression:1:14: Error: The method 'parseInt' isn't defined for the type 'String'.\nTry correcting the name to the name of an existing method, or defining a method named 'parseInt'.\nprint(\"1234\".parseInt())\n             ^^^^^^^^" in "1234"{<unresolved>}.parseInt());
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 7cdb4561874..b6fa1de488c 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
@@ -43,7 +43,7 @@ library test;
 //     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'.
+// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
 //             .substring(3);
 //              ^^^^^^^^^
@@ -107,7 +107,7 @@ static method test() → void {
     (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'.
+    (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 type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
             .substring(3);
              ^^^^^^^^^" in x{<unresolved>}.substring(3) as{TypeError,ForDynamic} core::String;
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.modular.expect
index 7cdb4561874..b6fa1de488c 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart.strong.modular.expect
@@ -43,7 +43,7 @@ library test;
 //     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'.
+// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
 //             .substring(3);
 //              ^^^^^^^^^
@@ -107,7 +107,7 @@ static method test() → void {
     (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'.
+    (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 type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
             .substring(3);
              ^^^^^^^^^" in x{<unresolved>}.substring(3) as{TypeError,ForDynamic} core::String;
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 45321b909fc..5be1dbdacfd 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
@@ -43,7 +43,7 @@ library test;
 //     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'.
+// pkg/front_end/testcases/inference/downwards_inference_on_function_expressions.dart:65:14: Error: The method 'substring' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
 //             .substring(3);
 //              ^^^^^^^^^
@@ -107,7 +107,7 @@ static method test() → void {
     (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'.
+    (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 type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
             .substring(3);
              ^^^^^^^^^" in x{<unresolved>}.substring(3) as{TypeError,ForDynamic,Unchecked} core::String;
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.expect b/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.expect
index 73c2e072565..b38716e5ea7 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.expect
@@ -43,7 +43,7 @@ library test;
 //         x;
 //         ^
 //
-// pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the class 'int'.
+// pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
 //         .substring(3);
 //          ^^^^^^^^^
@@ -123,7 +123,7 @@ static method test() → void {
     y = <T extends core::Object? = dynamic>(core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:64:9: Error: A value of type 'int' can't be returned from a function with return type 'String'.
         x;
         ^" in x as{TypeError} core::String;
-    y = <T extends core::Object? = dynamic>(core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the class 'int'.
+    y = <T extends core::Object? = dynamic>(core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
         .substring(3);
          ^^^^^^^^^" in x{<unresolved>}.substring(3) as{TypeError,ForDynamic} core::String;
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.modular.expect
index 73c2e072565..b38716e5ea7 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.modular.expect
@@ -43,7 +43,7 @@ library test;
 //         x;
 //         ^
 //
-// pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the class 'int'.
+// pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
 //         .substring(3);
 //          ^^^^^^^^^
@@ -123,7 +123,7 @@ static method test() → void {
     y = <T extends core::Object? = dynamic>(core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:64:9: Error: A value of type 'int' can't be returned from a function with return type 'String'.
         x;
         ^" in x as{TypeError} core::String;
-    y = <T extends core::Object? = dynamic>(core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the class 'int'.
+    y = <T extends core::Object? = dynamic>(core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
         .substring(3);
          ^^^^^^^^^" in x{<unresolved>}.substring(3) as{TypeError,ForDynamic} core::String;
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.transformed.expect
index 22835b8e5d5..aff5af9c2ed 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart.strong.transformed.expect
@@ -43,7 +43,7 @@ library test;
 //         x;
 //         ^
 //
-// pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the class 'int'.
+// pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'substring'.
 //         .substring(3);
 //          ^^^^^^^^^
@@ -123,7 +123,7 @@ static method test() → void {
     y = <T extends core::Object? = dynamic>(core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:64:9: Error: A value of type 'int' can't be returned from a function with return type 'String'.
         x;
         ^" in x as{TypeError} core::String;
-    y = <T extends core::Object? = dynamic>(core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the class 'int'.
+    y = <T extends core::Object? = dynamic>(core::int x) → core::String => invalid-expression "pkg/front_end/testcases/inference/downwards_inference_on_generic_function_expressions.dart:66:10: Error: The method 'substring' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'substring'.
         .substring(3);
          ^^^^^^^^^" in x{<unresolved>}.substring(3) as{TypeError,ForDynamic,Unchecked} core::String;
diff --git a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.expect
index b070dc8e37b..aa9db5af784 100644
--- a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.expect
@@ -2,7 +2,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the class 'FutureOr<String>'.
+// pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the type 'FutureOr<String>'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //                           /*@type=int*/ y) => /*info:DYNAMIC_CAST,info:DYNAMIC_INVOKE*/ x /*error:UNDEFINED_OPERATOR*/ +
 //                                                                                                                        ^
@@ -22,7 +22,7 @@ static method make(core::int x) → asy::Future<core::int>
 static method test() → dynamic {
   core::Iterable<asy::Future<core::int>> list = <core::int>[1, 2, 3].{core::Iterable::map}<asy::Future<core::int>>(#C1){((core::int) → asy::Future<core::int>) → core::Iterable<asy::Future<core::int>>};
   asy::Future<core::List<core::int>> results = asy::Future::wait<core::int>(list);
-  asy::Future<core::String> results2 = results.{asy::Future::then}<core::String>((core::List<core::int> list) → FutureOr<core::String> => list.{core::Iterable::fold}<FutureOr<core::String>>("", (FutureOr<core::String>x, core::int y) → FutureOr<core::String> => invalid-expression "pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the class 'FutureOr<String>'.
+  asy::Future<core::String> results2 = results.{asy::Future::then}<core::String>((core::List<core::int> list) → FutureOr<core::String> => list.{core::Iterable::fold}<FutureOr<core::String>>("", (FutureOr<core::String>x, core::int y) → FutureOr<core::String> => invalid-expression "pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the type 'FutureOr<String>'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
                           /*@type=int*/ y) => /*info:DYNAMIC_CAST,info:DYNAMIC_INVOKE*/ x /*error:UNDEFINED_OPERATOR*/ +
                                                                                                                        ^" in x{<unresolved>}.+(y.{core::int::toString}(){() → core::String}) as{TypeError,ForDynamic} FutureOr<core::String>){(FutureOr<core::String>, (FutureOr<core::String>, core::int) → FutureOr<core::String>) → FutureOr<core::String>}){((core::List<core::int>) → FutureOr<core::String>, {onError: core::Function?}) → asy::Future<core::String>};
diff --git a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.modular.expect b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.modular.expect
index b070dc8e37b..aa9db5af784 100644
--- a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the class 'FutureOr<String>'.
+// pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the type 'FutureOr<String>'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //                           /*@type=int*/ y) => /*info:DYNAMIC_CAST,info:DYNAMIC_INVOKE*/ x /*error:UNDEFINED_OPERATOR*/ +
 //                                                                                                                        ^
@@ -22,7 +22,7 @@ static method make(core::int x) → asy::Future<core::int>
 static method test() → dynamic {
   core::Iterable<asy::Future<core::int>> list = <core::int>[1, 2, 3].{core::Iterable::map}<asy::Future<core::int>>(#C1){((core::int) → asy::Future<core::int>) → core::Iterable<asy::Future<core::int>>};
   asy::Future<core::List<core::int>> results = asy::Future::wait<core::int>(list);
-  asy::Future<core::String> results2 = results.{asy::Future::then}<core::String>((core::List<core::int> list) → FutureOr<core::String> => list.{core::Iterable::fold}<FutureOr<core::String>>("", (FutureOr<core::String>x, core::int y) → FutureOr<core::String> => invalid-expression "pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the class 'FutureOr<String>'.
+  asy::Future<core::String> results2 = results.{asy::Future::then}<core::String>((core::List<core::int> list) → FutureOr<core::String> => list.{core::Iterable::fold}<FutureOr<core::String>>("", (FutureOr<core::String>x, core::int y) → FutureOr<core::String> => invalid-expression "pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the type 'FutureOr<String>'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
                           /*@type=int*/ y) => /*info:DYNAMIC_CAST,info:DYNAMIC_INVOKE*/ x /*error:UNDEFINED_OPERATOR*/ +
                                                                                                                        ^" in x{<unresolved>}.+(y.{core::int::toString}(){() → core::String}) as{TypeError,ForDynamic} FutureOr<core::String>){(FutureOr<core::String>, (FutureOr<core::String>, core::int) → FutureOr<core::String>) → FutureOr<core::String>}){((core::List<core::int>) → FutureOr<core::String>, {onError: core::Function?}) → asy::Future<core::String>};
diff --git a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.transformed.expect
index 7f36fac1f2d..fca5c77aeac 100644
--- a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library test;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the class 'FutureOr<String>'.
+// pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the type 'FutureOr<String>'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //                           /*@type=int*/ y) => /*info:DYNAMIC_CAST,info:DYNAMIC_INVOKE*/ x /*error:UNDEFINED_OPERATOR*/ +
 //                                                                                                                        ^
@@ -22,7 +22,7 @@ static method make(core::int x) → asy::Future<core::int>
 static method test() → dynamic {
   core::Iterable<asy::Future<core::int>> list = core::_GrowableList::_literal3<core::int>(1, 2, 3).{core::Iterable::map}<asy::Future<core::int>>(#C1){((core::int) → asy::Future<core::int>) → core::Iterable<asy::Future<core::int>>};
   asy::Future<core::List<core::int>> results = asy::Future::wait<core::int>(list);
-  asy::Future<core::String> results2 = results.{asy::Future::then}<core::String>((core::List<core::int> list) → FutureOr<core::String> => list.{core::Iterable::fold}<FutureOr<core::String>>("", (FutureOr<core::String>x, core::int y) → FutureOr<core::String> => invalid-expression "pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the class 'FutureOr<String>'.
+  asy::Future<core::String> results2 = results.{asy::Future::then}<core::String>((core::List<core::int> list) → FutureOr<core::String> => list.{core::Iterable::fold}<FutureOr<core::String>>("", (FutureOr<core::String>x, core::int y) → FutureOr<core::String> => invalid-expression "pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart:23:120: Error: The operator '+' isn't defined for the type 'FutureOr<String>'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
                           /*@type=int*/ y) => /*info:DYNAMIC_CAST,info:DYNAMIC_INVOKE*/ x /*error:UNDEFINED_OPERATOR*/ +
                                                                                                                        ^" in x{<unresolved>}.+(y.{core::int::toString}(){() → core::String}) as{TypeError,ForDynamic,Unchecked} FutureOr<core::String>){(FutureOr<core::String>, (FutureOr<core::String>, core::int) → FutureOr<core::String>) → FutureOr<core::String>}){((core::List<core::int>) → FutureOr<core::String>, {onError: core::Function?}) → asy::Future<core::String>};
diff --git a/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.expect b/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.expect
index 2b1d33d96eb..277e52527ec 100644
--- a/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.expect
@@ -10,7 +10,7 @@ library test;
 //   /*error:UNDEFINED_IDENTIFIER*/ x
 //                                  ^
 //
-// pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the class 'A'.
+// pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the type 'A'.
 //  - 'A' is from 'pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 // var i = /*error:UNDEFINED_OPERATOR,info:DYNAMIC_INVOKE*/ -new A();
@@ -105,7 +105,7 @@ static field self::A e = let final self::A #t1 = new self::A::•() in block {
 static field core::int f = 2.{core::num::+}(3){(core::num) → core::int};
 static field core::int g = 3.{core::int::unary-}(){() → core::int};
 static field self::B h = new self::A::•().{self::A::+}(3){(dynamic) → self::B};
-static field dynamic i = invalid-expression "pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the class 'A'.
+static field dynamic i = invalid-expression "pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the type 'A'.
  - 'A' is from 'pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 var i = /*error:UNDEFINED_OPERATOR,info:DYNAMIC_INVOKE*/ -new A();
diff --git a/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.modular.expect b/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.modular.expect
index 2b1d33d96eb..277e52527ec 100644
--- a/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.modular.expect
@@ -10,7 +10,7 @@ library test;
 //   /*error:UNDEFINED_IDENTIFIER*/ x
 //                                  ^
 //
-// pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the class 'A'.
+// pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the type 'A'.
 //  - 'A' is from 'pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 // var i = /*error:UNDEFINED_OPERATOR,info:DYNAMIC_INVOKE*/ -new A();
@@ -105,7 +105,7 @@ static field self::A e = let final self::A #t1 = new self::A::•() in block {
 static field core::int f = 2.{core::num::+}(3){(core::num) → core::int};
 static field core::int g = 3.{core::int::unary-}(){() → core::int};
 static field self::B h = new self::A::•().{self::A::+}(3){(dynamic) → self::B};
-static field dynamic i = invalid-expression "pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the class 'A'.
+static field dynamic i = invalid-expression "pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the type 'A'.
  - 'A' is from 'pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 var i = /*error:UNDEFINED_OPERATOR,info:DYNAMIC_INVOKE*/ -new A();
diff --git a/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.outline.expect b/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.outline.expect
index a8d96f40853..af3f7ea0748 100644
--- a/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.outline.expect
@@ -10,7 +10,7 @@ library test;
 //   /*error:UNDEFINED_IDENTIFIER*/ x
 //                                  ^
 //
-// pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the class 'A'.
+// pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the type 'A'.
 //  - 'A' is from 'pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 // var i = /*error:UNDEFINED_OPERATOR,info:DYNAMIC_INVOKE*/ -new A();
diff --git a/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.transformed.expect
index 9e7aae22790..cc2498509eb 100644
--- a/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart.strong.transformed.expect
@@ -10,7 +10,7 @@ library test;
 //   /*error:UNDEFINED_IDENTIFIER*/ x
 //                                  ^
 //
-// pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the class 'A'.
+// pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the type 'A'.
 //  - 'A' is from 'pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 // var i = /*error:UNDEFINED_OPERATOR,info:DYNAMIC_INVOKE*/ -new A();
@@ -105,7 +105,7 @@ static field self::A e = let final self::A #t1 = new self::A::•() in block {
 static field core::int f = 2.{core::num::+}(3){(core::num) → core::int};
 static field core::int g = 3.{core::int::unary-}(){() → core::int};
 static field self::B h = new self::A::•().{self::A::+}(3){(dynamic) → self::B};
-static field dynamic i = invalid-expression "pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the class 'A'.
+static field dynamic i = invalid-expression "pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart:32:58: Error: The operator 'unary-' isn't defined for the type 'A'.
  - 'A' is from 'pkg/front_end/testcases/inference/infer_from_complex_expressions_if_outer_most_value_is_precise.dart'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 var i = /*error:UNDEFINED_OPERATOR,info:DYNAMIC_INVOKE*/ -new A();
diff --git a/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.expect b/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.expect
index e2cd615cbb0..3cd09e266f4 100644
--- a/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.expect
+++ b/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the class 'num'.
+// pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the type 'num'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'isEven'.
 //     x.isEven; // Error.
 //       ^^^^^^
@@ -39,7 +39,7 @@ static method is_plusEq() → dynamic {
 static method is_postfix() → dynamic {
   core::num x = 2;
   if((let final core::num #t2 = x in let final core::num #t3 = x = #t2.{core::num::+}(1){(core::num) → core::num} in #t2) is core::int) {
-    invalid-expression "pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the class 'num'.
+    invalid-expression "pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the type 'num'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'isEven'.
     x.isEven; // Error.
       ^^^^^^" in x{<unresolved>}.isEven;
diff --git a/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.modular.expect b/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.modular.expect
index e2cd615cbb0..3cd09e266f4 100644
--- a/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the class 'num'.
+// pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the type 'num'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'isEven'.
 //     x.isEven; // Error.
 //       ^^^^^^
@@ -39,7 +39,7 @@ static method is_plusEq() → dynamic {
 static method is_postfix() → dynamic {
   core::num x = 2;
   if((let final core::num #t2 = x in let final core::num #t3 = x = #t2.{core::num::+}(1){(core::num) → core::num} in #t2) is core::int) {
-    invalid-expression "pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the class 'num'.
+    invalid-expression "pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the type 'num'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'isEven'.
     x.isEven; // Error.
       ^^^^^^" in x{<unresolved>}.isEven;
diff --git a/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.transformed.expect b/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.transformed.expect
index e2cd615cbb0..3cd09e266f4 100644
--- a/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the class 'num'.
+// pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the type 'num'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'isEven'.
 //     x.isEven; // Error.
 //       ^^^^^^
@@ -39,7 +39,7 @@ static method is_plusEq() → dynamic {
 static method is_postfix() → dynamic {
   core::num x = 2;
   if((let final core::num #t2 = x in let final core::num #t3 = x = #t2.{core::num::+}(1){(core::num) → core::num} in #t2) is core::int) {
-    invalid-expression "pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the class 'num'.
+    invalid-expression "pkg/front_end/testcases/inference_update_4/assignment_promotion_in_if_statement.dart:44:7: Error: The getter 'isEven' isn't defined for the type 'num'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'isEven'.
     x.isEven; // Error.
       ^^^^^^" in x{<unresolved>}.isEven;
diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.expect b/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.expect
index bb39353c245..1adc921838c 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.expect
@@ -100,25 +100,25 @@ library;
 //   void set instanceMethodAndSetter2(int value) {}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
 //   c.instanceFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
 //   c.instanceLateFinalFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
 //   c.instanceMethodAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
 //   c.instanceMethodAndSetter2();
@@ -161,7 +161,7 @@ static method test() → dynamic {
   c.{self::Class::instanceField} = 0;
   c.{self::Class::instanceFieldAndSetter1}{core::int};
   c.{self::Class::instanceFieldAndSetter1} = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
@@ -175,19 +175,19 @@ Try correcting the name to the name of an existing getter, or defining a getter
   c.{self::Class::instanceDuplicateFieldAndDuplicateSetter} = 0;
   c.{self::Class::instanceLateFinalFieldAndSetter1}{core::int};
   c.{self::Class::instanceLateFinalFieldAndSetter1} = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceLateFinalFieldAndSetter2;
   c.{self::Class::instanceLateFinalFieldAndSetter2} = 0;
   c.{self::Class::instanceMethodAndSetter1}(){() → core::int};
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
   c.instanceMethodAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceMethodAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
   c.instanceMethodAndSetter2();
diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.modular.expect
index bb39353c245..1adc921838c 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.modular.expect
@@ -100,25 +100,25 @@ library;
 //   void set instanceMethodAndSetter2(int value) {}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
 //   c.instanceFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
 //   c.instanceLateFinalFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
 //   c.instanceMethodAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
 //   c.instanceMethodAndSetter2();
@@ -161,7 +161,7 @@ static method test() → dynamic {
   c.{self::Class::instanceField} = 0;
   c.{self::Class::instanceFieldAndSetter1}{core::int};
   c.{self::Class::instanceFieldAndSetter1} = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
@@ -175,19 +175,19 @@ Try correcting the name to the name of an existing getter, or defining a getter
   c.{self::Class::instanceDuplicateFieldAndDuplicateSetter} = 0;
   c.{self::Class::instanceLateFinalFieldAndSetter1}{core::int};
   c.{self::Class::instanceLateFinalFieldAndSetter1} = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceLateFinalFieldAndSetter2;
   c.{self::Class::instanceLateFinalFieldAndSetter2} = 0;
   c.{self::Class::instanceMethodAndSetter1}(){() → core::int};
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
   c.instanceMethodAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceMethodAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
   c.instanceMethodAndSetter2();
diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.transformed.expect
index bb39353c245..1adc921838c 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.transformed.expect
@@ -100,25 +100,25 @@ library;
 //   void set instanceMethodAndSetter2(int value) {}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
 //   c.instanceFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
 //   c.instanceLateFinalFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
 //   c.instanceMethodAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
 //   c.instanceMethodAndSetter2();
@@ -161,7 +161,7 @@ static method test() → dynamic {
   c.{self::Class::instanceField} = 0;
   c.{self::Class::instanceFieldAndSetter1}{core::int};
   c.{self::Class::instanceFieldAndSetter1} = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:66:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
@@ -175,19 +175,19 @@ Try correcting the name to the name of an existing getter, or defining a getter
   c.{self::Class::instanceDuplicateFieldAndDuplicateSetter} = 0;
   c.{self::Class::instanceLateFinalFieldAndSetter1}{core::int};
   c.{self::Class::instanceLateFinalFieldAndSetter1} = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:76:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceLateFinalFieldAndSetter2;
   c.{self::Class::instanceLateFinalFieldAndSetter2} = 0;
   c.{self::Class::instanceMethodAndSetter1}(){() → core::int};
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:79:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
   c.instanceMethodAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceMethodAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance.dart:80:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/duplicates_instance.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
   c.instanceMethodAndSetter2();
diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.expect b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.expect
index 45dd1c7ad2c..4a86ab48b88 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.expect
@@ -155,122 +155,122 @@ library;
 //   void set instanceMethodAndSetter2(int value) {}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethod'.
 //   c.instanceMethod();
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceMethod'.
 //   (c.instanceMethod)();
 //      ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
 //   c.instanceGetter;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceSetter'.
 //   c.instanceSetter = 0;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
 //   c.instanceField;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceField'.
 //   c.instanceField = 0;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
 //   c.instanceFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter1'.
 //   c.instanceFieldAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
 //   c.instanceFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter2'.
 //   c.instanceFieldAndSetter2 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
 //   c.instanceLateFinalFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter1'.
 //   c.instanceLateFinalFieldAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
 //   c.instanceLateFinalFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter2'.
 //   c.instanceLateFinalFieldAndSetter2 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
 //   c.instanceDuplicateFieldAndSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndSetter'.
 //   c.instanceDuplicateFieldAndSetter = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndDuplicateSetter'.
 //   c.instanceFieldAndDuplicateSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndDuplicateSetter'.
 //   c.instanceFieldAndDuplicateSetter = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
 //   c.instanceDuplicateFieldAndDuplicateSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
 //   c.instanceDuplicateFieldAndDuplicateSetter = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter1'.
 //   c.instanceMethodAndSetter1();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
 //   c.instanceMethodAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
 //   c.instanceMethodAndSetter2();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter2'.
 //   c.instanceMethodAndSetter2 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -323,99 +323,99 @@ static extension-member method Extension|get#instanceMethodAndSetter1(lowered fi
 static extension-member method Extension|set#instanceMethodAndSetter2(lowered final core::int #this, core::int value) → void {}
 static method test() → dynamic {
   core::int c = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethod'.
   c.instanceMethod();
     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceMethod'.
   (c.instanceMethod)();
      ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod{dynamic}();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
   c.instanceGetter;
     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceGetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceSetter'.
   c.instanceSetter = 0;
     ^^^^^^^^^^^^^^" in c.{<unresolved>}instanceSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
   c.instanceField;
     ^^^^^^^^^^^^^" in c{<unresolved>}.instanceField;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceField'.
   c.instanceField = 0;
     ^^^^^^^^^^^^^" in c.{<unresolved>}instanceField = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceFieldAndSetter1;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceFieldAndSetter2;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter2 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceLateFinalFieldAndSetter1;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceLateFinalFieldAndSetter2;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter2 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceDuplicateFieldAndSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndDuplicateSetter'.
   c.instanceFieldAndDuplicateSetter;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceFieldAndDuplicateSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndDuplicateSetter'.
   c.instanceFieldAndDuplicateSetter = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndDuplicateSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceDuplicateFieldAndDuplicateSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndDuplicateSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter1'.
   c.instanceMethodAndSetter1();
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethodAndSetter1();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
   c.instanceMethodAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceMethodAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
   c.instanceMethodAndSetter2();
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethodAndSetter2();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter2'.
   c.instanceMethodAndSetter2 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceMethodAndSetter2 = 0;
diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.modular.expect
index 45dd1c7ad2c..4a86ab48b88 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.modular.expect
@@ -155,122 +155,122 @@ library;
 //   void set instanceMethodAndSetter2(int value) {}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethod'.
 //   c.instanceMethod();
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceMethod'.
 //   (c.instanceMethod)();
 //      ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
 //   c.instanceGetter;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceSetter'.
 //   c.instanceSetter = 0;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
 //   c.instanceField;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceField'.
 //   c.instanceField = 0;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
 //   c.instanceFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter1'.
 //   c.instanceFieldAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
 //   c.instanceFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter2'.
 //   c.instanceFieldAndSetter2 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
 //   c.instanceLateFinalFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter1'.
 //   c.instanceLateFinalFieldAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
 //   c.instanceLateFinalFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter2'.
 //   c.instanceLateFinalFieldAndSetter2 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
 //   c.instanceDuplicateFieldAndSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndSetter'.
 //   c.instanceDuplicateFieldAndSetter = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndDuplicateSetter'.
 //   c.instanceFieldAndDuplicateSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndDuplicateSetter'.
 //   c.instanceFieldAndDuplicateSetter = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
 //   c.instanceDuplicateFieldAndDuplicateSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
 //   c.instanceDuplicateFieldAndDuplicateSetter = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter1'.
 //   c.instanceMethodAndSetter1();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
 //   c.instanceMethodAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
 //   c.instanceMethodAndSetter2();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter2'.
 //   c.instanceMethodAndSetter2 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -323,99 +323,99 @@ static extension-member method Extension|get#instanceMethodAndSetter1(lowered fi
 static extension-member method Extension|set#instanceMethodAndSetter2(lowered final core::int #this, core::int value) → void {}
 static method test() → dynamic {
   core::int c = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethod'.
   c.instanceMethod();
     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceMethod'.
   (c.instanceMethod)();
      ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod{dynamic}();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
   c.instanceGetter;
     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceGetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceSetter'.
   c.instanceSetter = 0;
     ^^^^^^^^^^^^^^" in c.{<unresolved>}instanceSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
   c.instanceField;
     ^^^^^^^^^^^^^" in c{<unresolved>}.instanceField;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceField'.
   c.instanceField = 0;
     ^^^^^^^^^^^^^" in c.{<unresolved>}instanceField = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceFieldAndSetter1;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceFieldAndSetter2;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter2 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceLateFinalFieldAndSetter1;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceLateFinalFieldAndSetter2;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter2 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceDuplicateFieldAndSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndDuplicateSetter'.
   c.instanceFieldAndDuplicateSetter;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceFieldAndDuplicateSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndDuplicateSetter'.
   c.instanceFieldAndDuplicateSetter = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndDuplicateSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceDuplicateFieldAndDuplicateSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndDuplicateSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter1'.
   c.instanceMethodAndSetter1();
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethodAndSetter1();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
   c.instanceMethodAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceMethodAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
   c.instanceMethodAndSetter2();
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethodAndSetter2();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter2'.
   c.instanceMethodAndSetter2 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceMethodAndSetter2 = 0;
diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.transformed.expect
index 45dd1c7ad2c..4a86ab48b88 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.transformed.expect
@@ -155,122 +155,122 @@ library;
 //   void set instanceMethodAndSetter2(int value) {}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethod'.
 //   c.instanceMethod();
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceMethod'.
 //   (c.instanceMethod)();
 //      ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
 //   c.instanceGetter;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceSetter'.
 //   c.instanceSetter = 0;
 //     ^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
 //   c.instanceField;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceField'.
 //   c.instanceField = 0;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
 //   c.instanceFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter1'.
 //   c.instanceFieldAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
 //   c.instanceFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter2'.
 //   c.instanceFieldAndSetter2 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
 //   c.instanceLateFinalFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter1'.
 //   c.instanceLateFinalFieldAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
 //   c.instanceLateFinalFieldAndSetter2;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter2'.
 //   c.instanceLateFinalFieldAndSetter2 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
 //   c.instanceDuplicateFieldAndSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndSetter'.
 //   c.instanceDuplicateFieldAndSetter = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndDuplicateSetter'.
 //   c.instanceFieldAndDuplicateSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndDuplicateSetter'.
 //   c.instanceFieldAndDuplicateSetter = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
 //   c.instanceDuplicateFieldAndDuplicateSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
 //   c.instanceDuplicateFieldAndDuplicateSetter = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter1'.
 //   c.instanceMethodAndSetter1();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
 //   c.instanceMethodAndSetter1 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
 //   c.instanceMethodAndSetter2();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter2'.
 //   c.instanceMethodAndSetter2 = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -323,99 +323,99 @@ static extension-member method Extension|get#instanceMethodAndSetter1(lowered fi
 static extension-member method Extension|set#instanceMethodAndSetter2(lowered final core::int #this, core::int value) → void {}
 static method test() → dynamic {
   core::int c = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:55:5: Error: The method 'instanceMethod' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethod'.
   c.instanceMethod();
     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:56:6: Error: The getter 'instanceMethod' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceMethod'.
   (c.instanceMethod)();
      ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod{dynamic}();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:57:5: Error: The getter 'instanceGetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
   c.instanceGetter;
     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceGetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:58:5: Error: The setter 'instanceSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceSetter'.
   c.instanceSetter = 0;
     ^^^^^^^^^^^^^^" in c.{<unresolved>}instanceSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:59:5: Error: The getter 'instanceField' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
   c.instanceField;
     ^^^^^^^^^^^^^" in c{<unresolved>}.instanceField;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:60:5: Error: The setter 'instanceField' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceField'.
   c.instanceField = 0;
     ^^^^^^^^^^^^^" in c.{<unresolved>}instanceField = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:61:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceFieldAndSetter1;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:62:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:63:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceFieldAndSetter2;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:64:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter2 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:65:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceLateFinalFieldAndSetter1;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:66:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:67:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceLateFinalFieldAndSetter2;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:68:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter2 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:69:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceDuplicateFieldAndSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:70:5: Error: The setter 'instanceDuplicateFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:71:5: Error: The getter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndDuplicateSetter'.
   c.instanceFieldAndDuplicateSetter;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceFieldAndDuplicateSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:72:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceFieldAndDuplicateSetter'.
   c.instanceFieldAndDuplicateSetter = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndDuplicateSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:73:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceDuplicateFieldAndDuplicateSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:74:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndDuplicateSetter = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:75:5: Error: The method 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter1'.
   c.instanceMethodAndSetter1();
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethodAndSetter1();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:76:5: Error: The setter 'instanceMethodAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter1'.
   c.instanceMethodAndSetter1 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceMethodAndSetter1 = 0;
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:77:5: Error: The method 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'instanceMethodAndSetter2'.
   c.instanceMethodAndSetter2();
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethodAndSetter2();
-  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:78:5: Error: The setter 'instanceMethodAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter2'.
   c.instanceMethodAndSetter2 = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceMethodAndSetter2 = 0;
diff --git a/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.expect b/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.expect
index 5c186b133c1..ea472e5d6bc 100644
--- a/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.expect
@@ -12,7 +12,7 @@ library;
 //     SubClass subClass = t2.method2();
 //                            ^
 //
-// pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+// pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
 //  - 'SubClass' is from 'pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method2'.
 //     SubClass subClass = t3.method2();
@@ -66,7 +66,7 @@ static method test2<T extends self::Class>(self::test2::T t2) → dynamic {
 }
 static method test3<T extends core::Object? = dynamic>(self::test3::T% t3) → dynamic {
   if(t3 is self::SubClass) {
-    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
  - 'SubClass' is from 'pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method2'.
     SubClass subClass = t3.method2();
diff --git a/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.modular.expect
index 5c186b133c1..ea472e5d6bc 100644
--- a/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.modular.expect
@@ -12,7 +12,7 @@ library;
 //     SubClass subClass = t2.method2();
 //                            ^
 //
-// pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+// pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
 //  - 'SubClass' is from 'pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method2'.
 //     SubClass subClass = t3.method2();
@@ -66,7 +66,7 @@ static method test2<T extends self::Class>(self::test2::T t2) → dynamic {
 }
 static method test3<T extends core::Object? = dynamic>(self::test3::T% t3) → dynamic {
   if(t3 is self::SubClass) {
-    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
  - 'SubClass' is from 'pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method2'.
     SubClass subClass = t3.method2();
diff --git a/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.transformed.expect
index 2712ac3ef92..98c475630a7 100644
--- a/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart.strong.transformed.expect
@@ -12,7 +12,7 @@ library;
 //     SubClass subClass = t2.method2();
 //                            ^
 //
-// pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+// pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
 //  - 'SubClass' is from 'pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method2'.
 //     SubClass subClass = t3.method2();
@@ -66,7 +66,7 @@ static method test2<T extends self::Class>(self::test2::T t2) → dynamic {
 }
 static method test3<T extends core::Object? = dynamic>(self::test3::T% t3) → dynamic {
   if(t3 is self::SubClass) {
-    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the class 'SubClass'.
+    self::SubClass subClass = invalid-expression "pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart:32:28: Error: The method 'method2' isn't defined for the type 'SubClass'.
  - 'SubClass' is from 'pkg/front_end/testcases/nnbd/extension_type_variable_bound.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method2'.
     SubClass subClass = t3.method2();
diff --git a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.expect b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.expect
index 63f6d346f56..58dffbfaccb 100644
--- a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.expect
@@ -1083,132 +1083,132 @@ library;
 //       Extension.duplicateExtensionStaticFieldAndInstanceSetter2;
 //                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateInstanceFieldAndStaticSetter2'.
 //   c.duplicateInstanceFieldAndStaticSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceSetter'.
 //   c.staticFieldAndInstanceSetter = Class.staticFieldAndInstanceSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceDuplicateSetter'.
 //   c.staticFieldAndInstanceDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter1'.
 //   c.duplicateStaticFieldAndInstanceSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter2'.
 //   c.duplicateStaticFieldAndInstanceSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
 //                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndDuplicateSetter'.
 //       0.extensionInstanceFieldAndDuplicateSetter;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndDuplicateSetter'.
 //   0.extensionInstanceFieldAndDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
 //       0.duplicateExtensionInstanceFieldAndSetter1;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
 //   0.duplicateExtensionInstanceFieldAndSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
 //       0.duplicateExtensionInstanceFieldAndSetter2;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
 //   0.duplicateExtensionInstanceFieldAndSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceSetter'.
 //   0.extensionStaticFieldAndInstanceSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceDuplicateSetter'.
 //   0.extensionStaticFieldAndInstanceDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticSetter'.
 //       0.extensionInstanceFieldAndStaticSetter;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticSetter'.
 //   0.extensionInstanceFieldAndStaticSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
 //       0.extensionInstanceFieldAndStaticDuplicateSetter;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
 //   0.extensionInstanceFieldAndStaticDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
 //       0.duplicateExtensionInstanceFieldAndStaticSetter1;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
 //   0.duplicateExtensionInstanceFieldAndStaticSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
 //       0.duplicateExtensionInstanceFieldAndStaticSetter2;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
 //   0.duplicateExtensionInstanceFieldAndStaticSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter1'.
 //   0.duplicateExtensionStaticFieldAndInstanceSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter2'.
 //   0.duplicateExtensionStaticFieldAndInstanceSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1317,7 +1317,7 @@ static method test() → dynamic {
   c.{self::Class::instanceLateFinalFieldAndSetter} = c.{self::Class::instanceLateFinalFieldAndSetter}{core::int?};
   c.{self::Class::instanceLateFinalFieldAndDuplicateSetter} = c.{self::Class::instanceLateFinalFieldAndDuplicateSetter}{core::int?};
   c.{self::Class::duplicateInstanceFieldAndStaticSetter1} = c.{self::Class::duplicateInstanceFieldAndStaticSetter1}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateInstanceFieldAndStaticSetter2'.
   c.duplicateInstanceFieldAndStaticSetter2 =
@@ -1340,7 +1340,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:199:40: Error: Can't assign to this.
   Class.duplicateStaticFieldAndSetter2 = Class.duplicateStaticFieldAndSetter2;
                                        ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceSetter'.
   c.staticFieldAndInstanceSetter = Class.staticFieldAndInstanceSetter;
@@ -1350,7 +1350,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:202:38: Error: Can't assign to this.
   Class.staticFieldAndInstanceSetter = Class.staticFieldAndInstanceSetter;
                                      ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceDuplicateSetter'.
   c.staticFieldAndInstanceDuplicateSetter =
@@ -1368,7 +1368,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   Class.instanceFieldAndStaticDuplicateSetter =
                                               ^";
   c.{self::Class::instanceFieldAndStaticDuplicateSetter} = c.{self::Class::instanceFieldAndStaticDuplicateSetter}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter1'.
   c.duplicateStaticFieldAndInstanceSetter1 =
@@ -1378,7 +1378,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:219:48: Error: Can't assign to this.
   Class.duplicateStaticFieldAndInstanceSetter1 =
                                                ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter2'.
   c.duplicateStaticFieldAndInstanceSetter2 =
@@ -1394,31 +1394,31 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:229:48: Error: Can't assign to this.
   Class.duplicateInstanceFieldAndStaticSetter2 =
                                                ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndDuplicateSetter'.
   0.extensionInstanceFieldAndDuplicateSetter =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndDuplicateSetter'.
       0.extensionInstanceFieldAndDuplicateSetter;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndDuplicateSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
   0.duplicateExtensionInstanceFieldAndSetter1 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
       0.duplicateExtensionInstanceFieldAndSetter1;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndSetter1;
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
   0.duplicateExtensionInstanceFieldAndSetter2 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
       0.duplicateExtensionInstanceFieldAndSetter2;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndSetter2;
@@ -1440,7 +1440,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:254:53: Error: Can't assign to this.
   Extension.duplicateExtensionStaticFieldAndSetter2 =
                                                     ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceSetter'.
   0.extensionStaticFieldAndInstanceSetter =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:258:17: Error: Can't use 'extensionStaticFieldAndInstanceSetter' because it is declared more than once.
@@ -1449,7 +1449,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:259:51: Error: Can't assign to this.
   Extension.extensionStaticFieldAndInstanceSetter =
                                                   ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceDuplicateSetter'.
   0.extensionStaticFieldAndInstanceDuplicateSetter =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:263:17: Error: Can't use 'extensionStaticFieldAndInstanceDuplicateSetter' because it is declared more than once.
@@ -1461,47 +1461,47 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:267:51: Error: Can't assign to this.
   Extension.extensionInstanceFieldAndStaticSetter =
                                                   ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticSetter'.
   0.extensionInstanceFieldAndStaticSetter =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticSetter'.
       0.extensionInstanceFieldAndStaticSetter;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndStaticSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:272:60: Error: Can't assign to this.
   Extension.extensionInstanceFieldAndStaticDuplicateSetter =
                                                            ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
   0.extensionInstanceFieldAndStaticDuplicateSetter =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
       0.extensionInstanceFieldAndStaticDuplicateSetter;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndStaticDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:277:61: Error: Can't assign to this.
   Extension.duplicateExtensionInstanceFieldAndStaticSetter1 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
   0.duplicateExtensionInstanceFieldAndStaticSetter1 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
       0.duplicateExtensionInstanceFieldAndStaticSetter1;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndStaticSetter1;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:282:61: Error: Can't assign to this.
   Extension.duplicateExtensionInstanceFieldAndStaticSetter2 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
   0.duplicateExtensionInstanceFieldAndStaticSetter2 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
       0.duplicateExtensionInstanceFieldAndStaticSetter2;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndStaticSetter2;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:287:61: Error: Can't assign to this.
   Extension.duplicateExtensionStaticFieldAndInstanceSetter1 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter1'.
   0.duplicateExtensionStaticFieldAndInstanceSetter1 =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:290:17: Error: Can't use 'duplicateExtensionStaticFieldAndInstanceSetter1' because it is declared more than once.
@@ -1510,7 +1510,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:292:61: Error: Can't assign to this.
   Extension.duplicateExtensionStaticFieldAndInstanceSetter2 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter2'.
   0.duplicateExtensionStaticFieldAndInstanceSetter2 =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:295:17: Error: Can't use 'duplicateExtensionStaticFieldAndInstanceSetter2' because it is declared more than once.
diff --git a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.modular.expect
index 63f6d346f56..58dffbfaccb 100644
--- a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.modular.expect
@@ -1083,132 +1083,132 @@ library;
 //       Extension.duplicateExtensionStaticFieldAndInstanceSetter2;
 //                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateInstanceFieldAndStaticSetter2'.
 //   c.duplicateInstanceFieldAndStaticSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceSetter'.
 //   c.staticFieldAndInstanceSetter = Class.staticFieldAndInstanceSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceDuplicateSetter'.
 //   c.staticFieldAndInstanceDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter1'.
 //   c.duplicateStaticFieldAndInstanceSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter2'.
 //   c.duplicateStaticFieldAndInstanceSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
 //                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndDuplicateSetter'.
 //       0.extensionInstanceFieldAndDuplicateSetter;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndDuplicateSetter'.
 //   0.extensionInstanceFieldAndDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
 //       0.duplicateExtensionInstanceFieldAndSetter1;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
 //   0.duplicateExtensionInstanceFieldAndSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
 //       0.duplicateExtensionInstanceFieldAndSetter2;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
 //   0.duplicateExtensionInstanceFieldAndSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceSetter'.
 //   0.extensionStaticFieldAndInstanceSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceDuplicateSetter'.
 //   0.extensionStaticFieldAndInstanceDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticSetter'.
 //       0.extensionInstanceFieldAndStaticSetter;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticSetter'.
 //   0.extensionInstanceFieldAndStaticSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
 //       0.extensionInstanceFieldAndStaticDuplicateSetter;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
 //   0.extensionInstanceFieldAndStaticDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
 //       0.duplicateExtensionInstanceFieldAndStaticSetter1;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
 //   0.duplicateExtensionInstanceFieldAndStaticSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
 //       0.duplicateExtensionInstanceFieldAndStaticSetter2;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
 //   0.duplicateExtensionInstanceFieldAndStaticSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter1'.
 //   0.duplicateExtensionStaticFieldAndInstanceSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter2'.
 //   0.duplicateExtensionStaticFieldAndInstanceSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1317,7 +1317,7 @@ static method test() → dynamic {
   c.{self::Class::instanceLateFinalFieldAndSetter} = c.{self::Class::instanceLateFinalFieldAndSetter}{core::int?};
   c.{self::Class::instanceLateFinalFieldAndDuplicateSetter} = c.{self::Class::instanceLateFinalFieldAndDuplicateSetter}{core::int?};
   c.{self::Class::duplicateInstanceFieldAndStaticSetter1} = c.{self::Class::duplicateInstanceFieldAndStaticSetter1}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateInstanceFieldAndStaticSetter2'.
   c.duplicateInstanceFieldAndStaticSetter2 =
@@ -1340,7 +1340,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:199:40: Error: Can't assign to this.
   Class.duplicateStaticFieldAndSetter2 = Class.duplicateStaticFieldAndSetter2;
                                        ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceSetter'.
   c.staticFieldAndInstanceSetter = Class.staticFieldAndInstanceSetter;
@@ -1350,7 +1350,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:202:38: Error: Can't assign to this.
   Class.staticFieldAndInstanceSetter = Class.staticFieldAndInstanceSetter;
                                      ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceDuplicateSetter'.
   c.staticFieldAndInstanceDuplicateSetter =
@@ -1368,7 +1368,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   Class.instanceFieldAndStaticDuplicateSetter =
                                               ^";
   c.{self::Class::instanceFieldAndStaticDuplicateSetter} = c.{self::Class::instanceFieldAndStaticDuplicateSetter}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter1'.
   c.duplicateStaticFieldAndInstanceSetter1 =
@@ -1378,7 +1378,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:219:48: Error: Can't assign to this.
   Class.duplicateStaticFieldAndInstanceSetter1 =
                                                ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter2'.
   c.duplicateStaticFieldAndInstanceSetter2 =
@@ -1394,31 +1394,31 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:229:48: Error: Can't assign to this.
   Class.duplicateInstanceFieldAndStaticSetter2 =
                                                ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndDuplicateSetter'.
   0.extensionInstanceFieldAndDuplicateSetter =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndDuplicateSetter'.
       0.extensionInstanceFieldAndDuplicateSetter;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndDuplicateSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
   0.duplicateExtensionInstanceFieldAndSetter1 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
       0.duplicateExtensionInstanceFieldAndSetter1;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndSetter1;
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
   0.duplicateExtensionInstanceFieldAndSetter2 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
       0.duplicateExtensionInstanceFieldAndSetter2;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndSetter2;
@@ -1440,7 +1440,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:254:53: Error: Can't assign to this.
   Extension.duplicateExtensionStaticFieldAndSetter2 =
                                                     ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceSetter'.
   0.extensionStaticFieldAndInstanceSetter =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:258:17: Error: Can't use 'extensionStaticFieldAndInstanceSetter' because it is declared more than once.
@@ -1449,7 +1449,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:259:51: Error: Can't assign to this.
   Extension.extensionStaticFieldAndInstanceSetter =
                                                   ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceDuplicateSetter'.
   0.extensionStaticFieldAndInstanceDuplicateSetter =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:263:17: Error: Can't use 'extensionStaticFieldAndInstanceDuplicateSetter' because it is declared more than once.
@@ -1461,47 +1461,47 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:267:51: Error: Can't assign to this.
   Extension.extensionInstanceFieldAndStaticSetter =
                                                   ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticSetter'.
   0.extensionInstanceFieldAndStaticSetter =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticSetter'.
       0.extensionInstanceFieldAndStaticSetter;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndStaticSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:272:60: Error: Can't assign to this.
   Extension.extensionInstanceFieldAndStaticDuplicateSetter =
                                                            ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
   0.extensionInstanceFieldAndStaticDuplicateSetter =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
       0.extensionInstanceFieldAndStaticDuplicateSetter;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndStaticDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:277:61: Error: Can't assign to this.
   Extension.duplicateExtensionInstanceFieldAndStaticSetter1 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
   0.duplicateExtensionInstanceFieldAndStaticSetter1 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
       0.duplicateExtensionInstanceFieldAndStaticSetter1;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndStaticSetter1;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:282:61: Error: Can't assign to this.
   Extension.duplicateExtensionInstanceFieldAndStaticSetter2 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
   0.duplicateExtensionInstanceFieldAndStaticSetter2 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
       0.duplicateExtensionInstanceFieldAndStaticSetter2;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndStaticSetter2;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:287:61: Error: Can't assign to this.
   Extension.duplicateExtensionStaticFieldAndInstanceSetter1 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter1'.
   0.duplicateExtensionStaticFieldAndInstanceSetter1 =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:290:17: Error: Can't use 'duplicateExtensionStaticFieldAndInstanceSetter1' because it is declared more than once.
@@ -1510,7 +1510,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:292:61: Error: Can't assign to this.
   Extension.duplicateExtensionStaticFieldAndInstanceSetter2 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter2'.
   0.duplicateExtensionStaticFieldAndInstanceSetter2 =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:295:17: Error: Can't use 'duplicateExtensionStaticFieldAndInstanceSetter2' because it is declared more than once.
diff --git a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.transformed.expect
index 63f6d346f56..58dffbfaccb 100644
--- a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.strong.transformed.expect
@@ -1083,132 +1083,132 @@ library;
 //       Extension.duplicateExtensionStaticFieldAndInstanceSetter2;
 //                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateInstanceFieldAndStaticSetter2'.
 //   c.duplicateInstanceFieldAndStaticSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceSetter'.
 //   c.staticFieldAndInstanceSetter = Class.staticFieldAndInstanceSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceDuplicateSetter'.
 //   c.staticFieldAndInstanceDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter1'.
 //   c.duplicateStaticFieldAndInstanceSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter2'.
 //   c.duplicateStaticFieldAndInstanceSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
 //                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndDuplicateSetter'.
 //       0.extensionInstanceFieldAndDuplicateSetter;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndDuplicateSetter'.
 //   0.extensionInstanceFieldAndDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
 //       0.duplicateExtensionInstanceFieldAndSetter1;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
 //   0.duplicateExtensionInstanceFieldAndSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
 //       0.duplicateExtensionInstanceFieldAndSetter2;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
 //   0.duplicateExtensionInstanceFieldAndSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceSetter'.
 //   0.extensionStaticFieldAndInstanceSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceDuplicateSetter'.
 //   0.extensionStaticFieldAndInstanceDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticSetter'.
 //       0.extensionInstanceFieldAndStaticSetter;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticSetter'.
 //   0.extensionInstanceFieldAndStaticSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
 //       0.extensionInstanceFieldAndStaticDuplicateSetter;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
 //   0.extensionInstanceFieldAndStaticDuplicateSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
 //       0.duplicateExtensionInstanceFieldAndStaticSetter1;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
 //   0.duplicateExtensionInstanceFieldAndStaticSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
 //       0.duplicateExtensionInstanceFieldAndStaticSetter2;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
 //   0.duplicateExtensionInstanceFieldAndStaticSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter1'.
 //   0.duplicateExtensionStaticFieldAndInstanceSetter1 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter2'.
 //   0.duplicateExtensionStaticFieldAndInstanceSetter2 =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1317,7 +1317,7 @@ static method test() → dynamic {
   c.{self::Class::instanceLateFinalFieldAndSetter} = c.{self::Class::instanceLateFinalFieldAndSetter}{core::int?};
   c.{self::Class::instanceLateFinalFieldAndDuplicateSetter} = c.{self::Class::instanceLateFinalFieldAndDuplicateSetter}{core::int?};
   c.{self::Class::duplicateInstanceFieldAndStaticSetter1} = c.{self::Class::duplicateInstanceFieldAndStaticSetter1}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:190:5: Error: The setter 'duplicateInstanceFieldAndStaticSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateInstanceFieldAndStaticSetter2'.
   c.duplicateInstanceFieldAndStaticSetter2 =
@@ -1340,7 +1340,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:199:40: Error: Can't assign to this.
   Class.duplicateStaticFieldAndSetter2 = Class.duplicateStaticFieldAndSetter2;
                                        ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:201:5: Error: The setter 'staticFieldAndInstanceSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceSetter'.
   c.staticFieldAndInstanceSetter = Class.staticFieldAndInstanceSetter;
@@ -1350,7 +1350,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:202:38: Error: Can't assign to this.
   Class.staticFieldAndInstanceSetter = Class.staticFieldAndInstanceSetter;
                                      ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:204:5: Error: The setter 'staticFieldAndInstanceDuplicateSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticFieldAndInstanceDuplicateSetter'.
   c.staticFieldAndInstanceDuplicateSetter =
@@ -1368,7 +1368,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   Class.instanceFieldAndStaticDuplicateSetter =
                                               ^";
   c.{self::Class::instanceFieldAndStaticDuplicateSetter} = c.{self::Class::instanceFieldAndStaticDuplicateSetter}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:217:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter1'.
   c.duplicateStaticFieldAndInstanceSetter1 =
@@ -1378,7 +1378,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:219:48: Error: Can't assign to this.
   Class.duplicateStaticFieldAndInstanceSetter1 =
                                                ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:222:5: Error: The setter 'duplicateStaticFieldAndInstanceSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/field_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateStaticFieldAndInstanceSetter2'.
   c.duplicateStaticFieldAndInstanceSetter2 =
@@ -1394,31 +1394,31 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:229:48: Error: Can't assign to this.
   Class.duplicateInstanceFieldAndStaticSetter2 =
                                                ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:232:41: Error: The getter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceFieldAndSetter;
                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:233:5: Error: The setter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndDuplicateSetter'.
   0.extensionInstanceFieldAndDuplicateSetter =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:234:9: Error: The getter 'extensionInstanceFieldAndDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndDuplicateSetter'.
       0.extensionInstanceFieldAndDuplicateSetter;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndDuplicateSetter;
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:236:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
   0.duplicateExtensionInstanceFieldAndSetter1 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:237:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter1'.
       0.duplicateExtensionInstanceFieldAndSetter1;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndSetter1;
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:238:5: Error: The setter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
   0.duplicateExtensionInstanceFieldAndSetter2 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:239:9: Error: The getter 'duplicateExtensionInstanceFieldAndSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndSetter2'.
       0.duplicateExtensionInstanceFieldAndSetter2;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndSetter2;
@@ -1440,7 +1440,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:254:53: Error: Can't assign to this.
   Extension.duplicateExtensionStaticFieldAndSetter2 =
                                                     ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceSetter'.
   0.extensionStaticFieldAndInstanceSetter =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:258:17: Error: Can't use 'extensionStaticFieldAndInstanceSetter' because it is declared more than once.
@@ -1449,7 +1449,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:259:51: Error: Can't assign to this.
   Extension.extensionStaticFieldAndInstanceSetter =
                                                   ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:262:5: Error: The setter 'extensionStaticFieldAndInstanceDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticFieldAndInstanceDuplicateSetter'.
   0.extensionStaticFieldAndInstanceDuplicateSetter =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:263:17: Error: Can't use 'extensionStaticFieldAndInstanceDuplicateSetter' because it is declared more than once.
@@ -1461,47 +1461,47 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:267:51: Error: Can't assign to this.
   Extension.extensionInstanceFieldAndStaticSetter =
                                                   ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticSetter'.
   0.extensionInstanceFieldAndStaticSetter =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:270:9: Error: The getter 'extensionInstanceFieldAndStaticSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticSetter'.
       0.extensionInstanceFieldAndStaticSetter;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndStaticSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:272:60: Error: Can't assign to this.
   Extension.extensionInstanceFieldAndStaticDuplicateSetter =
                                                            ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
   0.extensionInstanceFieldAndStaticDuplicateSetter =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndStaticDuplicateSetter = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:275:9: Error: The getter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionInstanceFieldAndStaticDuplicateSetter'.
       0.extensionInstanceFieldAndStaticDuplicateSetter;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceFieldAndStaticDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:277:61: Error: Can't assign to this.
   Extension.duplicateExtensionInstanceFieldAndStaticSetter1 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
   0.duplicateExtensionInstanceFieldAndStaticSetter1 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:280:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter1'.
       0.duplicateExtensionInstanceFieldAndStaticSetter1;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndStaticSetter1;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:282:61: Error: Can't assign to this.
   Extension.duplicateExtensionInstanceFieldAndStaticSetter2 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
   0.duplicateExtensionInstanceFieldAndStaticSetter2 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionInstanceFieldAndStaticSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:285:9: Error: The getter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'duplicateExtensionInstanceFieldAndStaticSetter2'.
       0.duplicateExtensionInstanceFieldAndStaticSetter2;
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.duplicateExtensionInstanceFieldAndStaticSetter2;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:287:61: Error: Can't assign to this.
   Extension.duplicateExtensionStaticFieldAndInstanceSetter1 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter1'.
   0.duplicateExtensionStaticFieldAndInstanceSetter1 =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:290:17: Error: Can't use 'duplicateExtensionStaticFieldAndInstanceSetter1' because it is declared more than once.
@@ -1510,7 +1510,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:292:61: Error: Can't assign to this.
   Extension.duplicateExtensionStaticFieldAndInstanceSetter2 =
                                                             ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'duplicateExtensionStaticFieldAndInstanceSetter2'.
   0.duplicateExtensionStaticFieldAndInstanceSetter2 =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}duplicateExtensionStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:295:17: Error: Can't use 'duplicateExtensionStaticFieldAndInstanceSetter2' because it is declared more than once.
diff --git a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.expect b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.expect
index bdcd44249a5..9587238f51c 100644
--- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.expect
@@ -221,43 +221,43 @@ library;
 //   int? set methodAndSetter2() {}
 //                            ^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndField1'.
 //   c.methodAndField1 = c.methodAndField1;
 //     ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFieldAndSetter1'.
 //   c.methodAndFieldAndSetter1 = c.methodAndFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter3'.
 //   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter4'.
 //   c.methodAndFieldAndSetter4 = c.methodAndFieldAndSetter4;
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFinalFieldAndSetter1'.
 //   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter1'.
 //   c.methodAndSetter1 = c.methodAndSetter1;
 //     ^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter2'.
 //   c.methodAndSetter2 = c.methodAndSetter2;
@@ -298,7 +298,7 @@ class Class extends core::Object {
   set fieldAndFinalFieldAndSetter4(core::int? value) → void {}
 }
 static method test(self::Class c) → dynamic {
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndField1'.
   c.methodAndField1 = c.methodAndField1;
@@ -306,23 +306,23 @@ Try correcting the name to the name of an existing setter, or defining a setter
   c.{self::Class::methodAndField2} = c.{self::Class::methodAndField2}{core::int?};
   c.{self::Class::methodAndFinalField1}{() → core::int?};
   c.{self::Class::methodAndFinalField2}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFieldAndSetter1'.
   c.methodAndFieldAndSetter1 = c.methodAndFieldAndSetter1;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter1 = c.{self::Class::methodAndFieldAndSetter1}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter2} = c.{self::Class::methodAndFieldAndSetter2}{core::int?};
-  c.{self::Class::methodAndFieldAndSetter3} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the class 'Class'.
+  c.{self::Class::methodAndFieldAndSetter3} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter3'.
   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
                                  ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter3 as{TypeError,ForDynamic} core::int?;
-  c.{self::Class::methodAndFieldAndSetter4} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the class 'Class'.
+  c.{self::Class::methodAndFieldAndSetter4} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter4'.
   c.methodAndFieldAndSetter4 = c.methodAndFieldAndSetter4;
                                  ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter4 as{TypeError,ForDynamic} core::int?;
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFinalFieldAndSetter1'.
   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
@@ -330,12 +330,12 @@ Try correcting the name to the name of an existing setter, or defining a setter
   c.{self::Class::methodAndFinalFieldAndSetter2} = c.{self::Class::methodAndFinalFieldAndSetter2}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter3} = c.{self::Class::methodAndFinalFieldAndSetter3}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter4} = c.{self::Class::methodAndFinalFieldAndSetter4}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter1'.
   c.methodAndSetter1 = c.methodAndSetter1;
     ^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndSetter1 = c.{self::Class::methodAndSetter1}{() → core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter2'.
   c.methodAndSetter2 = c.methodAndSetter2;
diff --git a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.modular.expect
index bdcd44249a5..9587238f51c 100644
--- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.modular.expect
@@ -221,43 +221,43 @@ library;
 //   int? set methodAndSetter2() {}
 //                            ^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndField1'.
 //   c.methodAndField1 = c.methodAndField1;
 //     ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFieldAndSetter1'.
 //   c.methodAndFieldAndSetter1 = c.methodAndFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter3'.
 //   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter4'.
 //   c.methodAndFieldAndSetter4 = c.methodAndFieldAndSetter4;
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFinalFieldAndSetter1'.
 //   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter1'.
 //   c.methodAndSetter1 = c.methodAndSetter1;
 //     ^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter2'.
 //   c.methodAndSetter2 = c.methodAndSetter2;
@@ -298,7 +298,7 @@ class Class extends core::Object {
   set fieldAndFinalFieldAndSetter4(core::int? value) → void {}
 }
 static method test(self::Class c) → dynamic {
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndField1'.
   c.methodAndField1 = c.methodAndField1;
@@ -306,23 +306,23 @@ Try correcting the name to the name of an existing setter, or defining a setter
   c.{self::Class::methodAndField2} = c.{self::Class::methodAndField2}{core::int?};
   c.{self::Class::methodAndFinalField1}{() → core::int?};
   c.{self::Class::methodAndFinalField2}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFieldAndSetter1'.
   c.methodAndFieldAndSetter1 = c.methodAndFieldAndSetter1;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter1 = c.{self::Class::methodAndFieldAndSetter1}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter2} = c.{self::Class::methodAndFieldAndSetter2}{core::int?};
-  c.{self::Class::methodAndFieldAndSetter3} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the class 'Class'.
+  c.{self::Class::methodAndFieldAndSetter3} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter3'.
   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
                                  ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter3 as{TypeError,ForDynamic} core::int?;
-  c.{self::Class::methodAndFieldAndSetter4} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the class 'Class'.
+  c.{self::Class::methodAndFieldAndSetter4} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter4'.
   c.methodAndFieldAndSetter4 = c.methodAndFieldAndSetter4;
                                  ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter4 as{TypeError,ForDynamic} core::int?;
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFinalFieldAndSetter1'.
   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
@@ -330,12 +330,12 @@ Try correcting the name to the name of an existing setter, or defining a setter
   c.{self::Class::methodAndFinalFieldAndSetter2} = c.{self::Class::methodAndFinalFieldAndSetter2}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter3} = c.{self::Class::methodAndFinalFieldAndSetter3}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter4} = c.{self::Class::methodAndFinalFieldAndSetter4}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter1'.
   c.methodAndSetter1 = c.methodAndSetter1;
     ^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndSetter1 = c.{self::Class::methodAndSetter1}{() → core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter2'.
   c.methodAndSetter2 = c.methodAndSetter2;
diff --git a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.transformed.expect
index 91f166e9f77..c262fb80295 100644
--- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.transformed.expect
@@ -221,43 +221,43 @@ library;
 //   int? set methodAndSetter2() {}
 //                            ^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndField1'.
 //   c.methodAndField1 = c.methodAndField1;
 //     ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFieldAndSetter1'.
 //   c.methodAndFieldAndSetter1 = c.methodAndFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter3'.
 //   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter4'.
 //   c.methodAndFieldAndSetter4 = c.methodAndFieldAndSetter4;
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFinalFieldAndSetter1'.
 //   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter1'.
 //   c.methodAndSetter1 = c.methodAndSetter1;
 //     ^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter2'.
 //   c.methodAndSetter2 = c.methodAndSetter2;
@@ -298,7 +298,7 @@ class Class extends core::Object {
   set fieldAndFinalFieldAndSetter4(core::int? value) → void {}
 }
 static method test(self::Class c) → dynamic {
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:80:5: Error: The setter 'methodAndField1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndField1'.
   c.methodAndField1 = c.methodAndField1;
@@ -306,23 +306,23 @@ Try correcting the name to the name of an existing setter, or defining a setter
   c.{self::Class::methodAndField2} = c.{self::Class::methodAndField2}{core::int?};
   c.{self::Class::methodAndFinalField1}{() → core::int?};
   c.{self::Class::methodAndFinalField2}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:84:5: Error: The setter 'methodAndFieldAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFieldAndSetter1'.
   c.methodAndFieldAndSetter1 = c.methodAndFieldAndSetter1;
     ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter1 = c.{self::Class::methodAndFieldAndSetter1}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter2} = c.{self::Class::methodAndFieldAndSetter2}{core::int?};
-  c.{self::Class::methodAndFieldAndSetter3} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the class 'Class'.
+  c.{self::Class::methodAndFieldAndSetter3} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:34: Error: The getter 'methodAndFieldAndSetter3' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter3'.
   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
                                  ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter3 as{TypeError,ForDynamic,Unchecked} core::int?;
-  c.{self::Class::methodAndFieldAndSetter4} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the class 'Class'.
+  c.{self::Class::methodAndFieldAndSetter4} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:87:34: Error: The getter 'methodAndFieldAndSetter4' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'methodAndFieldAndSetter4'.
   c.methodAndFieldAndSetter4 = c.methodAndFieldAndSetter4;
                                  ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter4 as{TypeError,ForDynamic,Unchecked} core::int?;
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:5: Error: The setter 'methodAndFinalFieldAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndFinalFieldAndSetter1'.
   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
@@ -330,12 +330,12 @@ Try correcting the name to the name of an existing setter, or defining a setter
   c.{self::Class::methodAndFinalFieldAndSetter2} = c.{self::Class::methodAndFinalFieldAndSetter2}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter3} = c.{self::Class::methodAndFinalFieldAndSetter3}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter4} = c.{self::Class::methodAndFinalFieldAndSetter4}{core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:92:5: Error: The setter 'methodAndSetter1' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter1'.
   c.methodAndSetter1 = c.methodAndSetter1;
     ^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndSetter1 = c.{self::Class::methodAndSetter1}{() → core::int?};
-  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:93:5: Error: The setter 'methodAndSetter2' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/instance_duplicates.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'methodAndSetter2'.
   c.methodAndSetter2 = c.methodAndSetter2;
diff --git a/pkg/front_end/testcases/nnbd/issue41386.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue41386.dart.strong.expect
index 68136136fb3..3715694c896 100644
--- a/pkg/front_end/testcases/nnbd/issue41386.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/issue41386.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '%' operator.
 //   print(predicate((v) => v % 2 == 1)(3));
@@ -14,7 +14,7 @@ import "dart:core" as core;
 static method predicate<T extends core::Object? = dynamic>((self::predicate::T%) → core::bool fn) → (self::predicate::T%) → core::bool
   return (self::predicate::T% val) → core::bool => fn(val){(self::predicate::T%) → core::bool};
 static method test() → void {
-  core::print(self::predicate<core::Object?>((core::Object? v) → core::bool => invalid-expression "pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the class 'Object?'.
+  core::print(self::predicate<core::Object?>((core::Object? v) → core::bool => invalid-expression "pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '%' operator.
   print(predicate((v) => v % 2 == 1)(3));
diff --git a/pkg/front_end/testcases/nnbd/issue41386.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/issue41386.dart.strong.modular.expect
index 68136136fb3..3715694c896 100644
--- a/pkg/front_end/testcases/nnbd/issue41386.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/issue41386.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '%' operator.
 //   print(predicate((v) => v % 2 == 1)(3));
@@ -14,7 +14,7 @@ import "dart:core" as core;
 static method predicate<T extends core::Object? = dynamic>((self::predicate::T%) → core::bool fn) → (self::predicate::T%) → core::bool
   return (self::predicate::T% val) → core::bool => fn(val){(self::predicate::T%) → core::bool};
 static method test() → void {
-  core::print(self::predicate<core::Object?>((core::Object? v) → core::bool => invalid-expression "pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the class 'Object?'.
+  core::print(self::predicate<core::Object?>((core::Object? v) → core::bool => invalid-expression "pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '%' operator.
   print(predicate((v) => v % 2 == 1)(3));
diff --git a/pkg/front_end/testcases/nnbd/issue41386.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue41386.dart.strong.transformed.expect
index 68136136fb3..3715694c896 100644
--- a/pkg/front_end/testcases/nnbd/issue41386.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/issue41386.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '%' operator.
 //   print(predicate((v) => v % 2 == 1)(3));
@@ -14,7 +14,7 @@ import "dart:core" as core;
 static method predicate<T extends core::Object? = dynamic>((self::predicate::T%) → core::bool fn) → (self::predicate::T%) → core::bool
   return (self::predicate::T% val) → core::bool => fn(val){(self::predicate::T%) → core::bool};
 static method test() → void {
-  core::print(self::predicate<core::Object?>((core::Object? v) → core::bool => invalid-expression "pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the class 'Object?'.
+  core::print(self::predicate<core::Object?>((core::Object? v) → core::bool => invalid-expression "pkg/front_end/testcases/nnbd/issue41386.dart:8:28: Error: The operator '%' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '%' operator.
   print(predicate((v) => v % 2 == 1)(3));
diff --git a/pkg/front_end/testcases/nnbd/issue41520.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue41520.dart.strong.expect
index 9d130b8346e..5ed8fa5f31e 100644
--- a/pkg/front_end/testcases/nnbd/issue41520.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/issue41520.dart.strong.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
 //     error.notAMethodOnObject();
 //           ^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
 //     error.notAMethodOnObject();
 //           ^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the class 'StackTrace'.
+// pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the type 'StackTrace'.
 //  - 'StackTrace' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnStackTrace'.
 //     stackTrace.notAMethodOnStackTrace();
@@ -27,7 +27,7 @@ static method errors() → void {
   try {
   }
   on core::Object catch(final core::Object error) {
-    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
     error.notAMethodOnObject();
@@ -37,12 +37,12 @@ Try correcting the name to the name of an existing method, or defining a method
   try {
   }
   on core::Object catch(final core::Object error, final core::StackTrace stackTrace) {
-    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
     error.notAMethodOnObject();
           ^^^^^^^^^^^^^^^^^^" in error{<unresolved>}.notAMethodOnObject();
-    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the class 'StackTrace'.
+    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the type 'StackTrace'.
  - 'StackTrace' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnStackTrace'.
     stackTrace.notAMethodOnStackTrace();
diff --git a/pkg/front_end/testcases/nnbd/issue41520.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/issue41520.dart.strong.modular.expect
index 9d130b8346e..5ed8fa5f31e 100644
--- a/pkg/front_end/testcases/nnbd/issue41520.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/issue41520.dart.strong.modular.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
 //     error.notAMethodOnObject();
 //           ^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
 //     error.notAMethodOnObject();
 //           ^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the class 'StackTrace'.
+// pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the type 'StackTrace'.
 //  - 'StackTrace' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnStackTrace'.
 //     stackTrace.notAMethodOnStackTrace();
@@ -27,7 +27,7 @@ static method errors() → void {
   try {
   }
   on core::Object catch(final core::Object error) {
-    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
     error.notAMethodOnObject();
@@ -37,12 +37,12 @@ Try correcting the name to the name of an existing method, or defining a method
   try {
   }
   on core::Object catch(final core::Object error, final core::StackTrace stackTrace) {
-    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
     error.notAMethodOnObject();
           ^^^^^^^^^^^^^^^^^^" in error{<unresolved>}.notAMethodOnObject();
-    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the class 'StackTrace'.
+    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the type 'StackTrace'.
  - 'StackTrace' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnStackTrace'.
     stackTrace.notAMethodOnStackTrace();
diff --git a/pkg/front_end/testcases/nnbd/issue41520.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue41520.dart.strong.transformed.expect
index 9d130b8346e..5ed8fa5f31e 100644
--- a/pkg/front_end/testcases/nnbd/issue41520.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/issue41520.dart.strong.transformed.expect
@@ -2,19 +2,19 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
 //     error.notAMethodOnObject();
 //           ^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
 //     error.notAMethodOnObject();
 //           ^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the class 'StackTrace'.
+// pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the type 'StackTrace'.
 //  - 'StackTrace' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnStackTrace'.
 //     stackTrace.notAMethodOnStackTrace();
@@ -27,7 +27,7 @@ static method errors() → void {
   try {
   }
   on core::Object catch(final core::Object error) {
-    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:7:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
     error.notAMethodOnObject();
@@ -37,12 +37,12 @@ Try correcting the name to the name of an existing method, or defining a method
   try {
   }
   on core::Object catch(final core::Object error, final core::StackTrace stackTrace) {
-    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:12:11: Error: The method 'notAMethodOnObject' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnObject'.
     error.notAMethodOnObject();
           ^^^^^^^^^^^^^^^^^^" in error{<unresolved>}.notAMethodOnObject();
-    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the class 'StackTrace'.
+    invalid-expression "pkg/front_end/testcases/nnbd/issue41520.dart:13:16: Error: The method 'notAMethodOnStackTrace' isn't defined for the type 'StackTrace'.
  - 'StackTrace' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'notAMethodOnStackTrace'.
     stackTrace.notAMethodOnStackTrace();
diff --git a/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.expect
index bb9d1e8cc9d..58f9d71b736 100644
--- a/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the type 'Null'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   x.foo();
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   y.foo();
 //     ^^^
@@ -16,12 +16,12 @@ import self as self;
 
 static method test() → dynamic {
   has-declared-initializer Null x = null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the type 'Null'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   x.foo();
     ^^^" in x{<unresolved>}.foo();
   has-declared-initializer Null y = null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   y.foo();
     ^^^" in y{<unresolved>}.foo();
diff --git a/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.modular.expect
index bb9d1e8cc9d..58f9d71b736 100644
--- a/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.modular.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the type 'Null'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   x.foo();
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   y.foo();
 //     ^^^
@@ -16,12 +16,12 @@ import self as self;
 
 static method test() → dynamic {
   has-declared-initializer Null x = null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the type 'Null'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   x.foo();
     ^^^" in x{<unresolved>}.foo();
   has-declared-initializer Null y = null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   y.foo();
     ^^^" in y{<unresolved>}.foo();
diff --git a/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.transformed.expect
index bb9d1e8cc9d..58f9d71b736 100644
--- a/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/issue41700a.dart.strong.transformed.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the type 'Null'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   x.foo();
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   y.foo();
 //     ^^^
@@ -16,12 +16,12 @@ import self as self;
 
 static method test() → dynamic {
   has-declared-initializer Null x = null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:7:5: Error: The method 'foo' isn't defined for the type 'Null'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   x.foo();
     ^^^" in x{<unresolved>}.foo();
   has-declared-initializer Null y = null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700a.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   y.foo();
     ^^^" in y{<unresolved>}.foo();
diff --git a/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.expect
index 20e30b99423..a4a9b1fe5a6 100644
--- a/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.expect
@@ -7,13 +7,13 @@ library;
 //   Null x = null;
 //            ^
 //
-// pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
 //  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   x.foo();
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the class 'Null?'.
+// pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the type 'Null?'.
 //  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   y.foo();
@@ -32,13 +32,13 @@ static method test() → dynamic {
  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
   Null x = null;
            ^" in null as{TypeError} self::Null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   x.foo();
     ^^^" in x{<unresolved>}.foo();
   has-declared-initializer self::Null? y = null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the class 'Null?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the type 'Null?'.
  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   y.foo();
diff --git a/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.modular.expect
index 20e30b99423..a4a9b1fe5a6 100644
--- a/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.modular.expect
@@ -7,13 +7,13 @@ library;
 //   Null x = null;
 //            ^
 //
-// pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
 //  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   x.foo();
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the class 'Null?'.
+// pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the type 'Null?'.
 //  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   y.foo();
@@ -32,13 +32,13 @@ static method test() → dynamic {
  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
   Null x = null;
            ^" in null as{TypeError} self::Null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   x.foo();
     ^^^" in x{<unresolved>}.foo();
   has-declared-initializer self::Null? y = null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the class 'Null?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the type 'Null?'.
  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   y.foo();
diff --git a/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.transformed.expect
index 74bf3a62b99..d1669ff1152 100644
--- a/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/issue41700b.dart.strong.transformed.expect
@@ -7,13 +7,13 @@ library;
 //   Null x = null;
 //            ^
 //
-// pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+// pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
 //  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   x.foo();
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the class 'Null?'.
+// pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the type 'Null?'.
 //  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   y.foo();
@@ -32,13 +32,13 @@ static method test() → dynamic {
  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
   Null x = null;
            ^" in let Null #t1 = null in #t1 == null ?{self::Null} #t1 as{TypeError} self::Null : #t1{self::Null};
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the class 'Null'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:9:5: Error: The method 'foo' isn't defined for the type 'Null'.
  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   x.foo();
     ^^^" in x{<unresolved>}.foo();
   has-declared-initializer self::Null? y = null;
-  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the class 'Null?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/issue41700b.dart:11:5: Error: The method 'foo' isn't defined for the type 'Null?'.
  - 'Null' is from 'pkg/front_end/testcases/nnbd/issue41700b.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   y.foo();
diff --git a/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.expect
index b9ff42d08dd..ec2df17fec8 100644
--- a/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
 //   wrap2(() => foo()..property?.unknown());
@@ -29,7 +29,7 @@ static method bar() → dynamic {
     #t1{dynamic}.unknown();
   } =>#t1);
   self::wrap2<core::Object?>(() → self::A<core::Object?> => let final self::A<core::Object?> #t2 = self::foo<self::A<core::Object?>>() in block {
-    let final core::Object? #t3 = #t2.{self::A::property}{core::Object?} in #t3 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the class 'Object'.
+    let final core::Object? #t3 = #t2.{self::A::property}{core::Object?} in #t3 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
   wrap2(() => foo()..property?.unknown());
diff --git a/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.modular.expect
index b9ff42d08dd..ec2df17fec8 100644
--- a/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
 //   wrap2(() => foo()..property?.unknown());
@@ -29,7 +29,7 @@ static method bar() → dynamic {
     #t1{dynamic}.unknown();
   } =>#t1);
   self::wrap2<core::Object?>(() → self::A<core::Object?> => let final self::A<core::Object?> #t2 = self::foo<self::A<core::Object?>>() in block {
-    let final core::Object? #t3 = #t2.{self::A::property}{core::Object?} in #t3 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the class 'Object'.
+    let final core::Object? #t3 = #t2.{self::A::property}{core::Object?} in #t3 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
   wrap2(() => foo()..property?.unknown());
diff --git a/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.transformed.expect
index b9ff42d08dd..ec2df17fec8 100644
--- a/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/issue42579_2.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
 //   wrap2(() => foo()..property?.unknown());
@@ -29,7 +29,7 @@ static method bar() → dynamic {
     #t1{dynamic}.unknown();
   } =>#t1);
   self::wrap2<core::Object?>(() → self::A<core::Object?> => let final self::A<core::Object?> #t2 = self::foo<self::A<core::Object?>>() in block {
-    let final core::Object? #t3 = #t2.{self::A::property}{core::Object?} in #t3 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the class 'Object'.
+    let final core::Object? #t3 = #t2.{self::A::property}{core::Object?} in #t3 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_2.dart:19:32: Error: The method 'unknown' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
   wrap2(() => foo()..property?.unknown());
diff --git a/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.expect
index 80ab92e90e4..0ffe4a9a66d 100644
--- a/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
 //   foo(() => B()..y1[0]?.unknown());
 //                         ^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
 //   foo(() => B()..y2[0]?.unknown());
@@ -36,14 +36,14 @@ class B<Y1 extends core::Object? = dynamic, Y2 extends core::List<self::B::Y3%>
 static method foo<Z extends core::Object? = dynamic>(() → self::A<core::List<self::foo::Z%>> f) → dynamic {}
 static method bar() → dynamic {
   self::foo<core::Object?>(() → self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> => let final self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> #t1 = new self::B::•<core::List<core::Object?>, core::List<core::Object?>, dynamic>() in block {
-    let final core::Object? #t2 = #t1.{self::B::y1}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t2 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+    let final core::Object? #t2 = #t1.{self::B::y1}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t2 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
   foo(() => B()..y1[0]?.unknown());
                         ^^^^^^^" in #t2{core::Object}{<unresolved>}.unknown();
   } =>#t1);
   self::foo<core::Object?>(() → self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> => let final self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> #t3 = new self::B::•<core::List<core::Object?>, core::List<core::Object?>, dynamic>() in block {
-    let final core::Object? #t4 = #t3.{self::B::y2}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t4 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+    let final core::Object? #t4 = #t3.{self::B::y2}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t4 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
   foo(() => B()..y2[0]?.unknown());
diff --git a/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.modular.expect
index 80ab92e90e4..0ffe4a9a66d 100644
--- a/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.modular.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
 //   foo(() => B()..y1[0]?.unknown());
 //                         ^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
 //   foo(() => B()..y2[0]?.unknown());
@@ -36,14 +36,14 @@ class B<Y1 extends core::Object? = dynamic, Y2 extends core::List<self::B::Y3%>
 static method foo<Z extends core::Object? = dynamic>(() → self::A<core::List<self::foo::Z%>> f) → dynamic {}
 static method bar() → dynamic {
   self::foo<core::Object?>(() → self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> => let final self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> #t1 = new self::B::•<core::List<core::Object?>, core::List<core::Object?>, dynamic>() in block {
-    let final core::Object? #t2 = #t1.{self::B::y1}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t2 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+    let final core::Object? #t2 = #t1.{self::B::y1}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t2 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
   foo(() => B()..y1[0]?.unknown());
                         ^^^^^^^" in #t2{core::Object}{<unresolved>}.unknown();
   } =>#t1);
   self::foo<core::Object?>(() → self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> => let final self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> #t3 = new self::B::•<core::List<core::Object?>, core::List<core::Object?>, dynamic>() in block {
-    let final core::Object? #t4 = #t3.{self::B::y2}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t4 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+    let final core::Object? #t4 = #t3.{self::B::y2}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t4 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
   foo(() => B()..y2[0]?.unknown());
diff --git a/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.transformed.expect
index 80ab92e90e4..0ffe4a9a66d 100644
--- a/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/issue42579_3.dart.strong.transformed.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
 //   foo(() => B()..y1[0]?.unknown());
 //                         ^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+// pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the type 'Object'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
 //   foo(() => B()..y2[0]?.unknown());
@@ -36,14 +36,14 @@ class B<Y1 extends core::Object? = dynamic, Y2 extends core::List<self::B::Y3%>
 static method foo<Z extends core::Object? = dynamic>(() → self::A<core::List<self::foo::Z%>> f) → dynamic {}
 static method bar() → dynamic {
   self::foo<core::Object?>(() → self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> => let final self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> #t1 = new self::B::•<core::List<core::Object?>, core::List<core::Object?>, dynamic>() in block {
-    let final core::Object? #t2 = #t1.{self::B::y1}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t2 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+    let final core::Object? #t2 = #t1.{self::B::y1}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t2 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:16:25: Error: The method 'unknown' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
   foo(() => B()..y1[0]?.unknown());
                         ^^^^^^^" in #t2{core::Object}{<unresolved>}.unknown();
   } =>#t1);
   self::foo<core::Object?>(() → self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> => let final self::B<core::List<core::Object?>, core::List<core::Object?>, dynamic> #t3 = new self::B::•<core::List<core::Object?>, core::List<core::Object?>, dynamic>() in block {
-    let final core::Object? #t4 = #t3.{self::B::y2}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t4 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the class 'Object'.
+    let final core::Object? #t4 = #t3.{self::B::y2}{core::List<core::Object?>}.{core::List::[]}(0){(core::int) → core::Object?} in #t4 == null ?{dynamic} null : invalid-expression "pkg/front_end/testcases/nnbd/issue42579_3.dart:17:25: Error: The method 'unknown' isn't defined for the type 'Object'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing method, or defining a method named 'unknown'.
   foo(() => B()..y2[0]?.unknown());
diff --git a/pkg/front_end/testcases/nnbd/late.dart.strong.expect b/pkg/front_end/testcases/nnbd/late.dart.strong.expect
index 5ae8065b0c5..d7a7a5d7fb3 100644
--- a/pkg/front_end/testcases/nnbd/late.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/late.dart.strong.expect
@@ -10,7 +10,7 @@ library;
 //     lateFinalStaticFieldWithInit = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
 //     lateFinalInstanceFieldWithInit = 0;
@@ -24,7 +24,7 @@ library;
 //   Class.lateFinalStaticFieldWithInit = 0;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
 //   c.lateFinalInstanceFieldWithInit = 0;
@@ -63,7 +63,7 @@ class Class extends core::Object {
     invalid-expression "pkg/front_end/testcases/nnbd/late.dart:40:5: Error: Can't assign to the final variable 'lateFinalVariableWithInit'.
     lateFinalVariableWithInit = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+    invalid-expression "pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
     lateFinalInstanceFieldWithInit = 0;
@@ -93,7 +93,7 @@ static method errors() → dynamic {
   lateFinalTopLevelFieldWithInit = 0;
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   self::Class c = new self::Class::•();
-  invalid-expression "pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
   c.lateFinalInstanceFieldWithInit = 0;
diff --git a/pkg/front_end/testcases/nnbd/late.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/late.dart.strong.modular.expect
index 5ae8065b0c5..d7a7a5d7fb3 100644
--- a/pkg/front_end/testcases/nnbd/late.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/late.dart.strong.modular.expect
@@ -10,7 +10,7 @@ library;
 //     lateFinalStaticFieldWithInit = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
 //     lateFinalInstanceFieldWithInit = 0;
@@ -24,7 +24,7 @@ library;
 //   Class.lateFinalStaticFieldWithInit = 0;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
 //   c.lateFinalInstanceFieldWithInit = 0;
@@ -63,7 +63,7 @@ class Class extends core::Object {
     invalid-expression "pkg/front_end/testcases/nnbd/late.dart:40:5: Error: Can't assign to the final variable 'lateFinalVariableWithInit'.
     lateFinalVariableWithInit = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+    invalid-expression "pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
     lateFinalInstanceFieldWithInit = 0;
@@ -93,7 +93,7 @@ static method errors() → dynamic {
   lateFinalTopLevelFieldWithInit = 0;
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   self::Class c = new self::Class::•();
-  invalid-expression "pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
   c.lateFinalInstanceFieldWithInit = 0;
diff --git a/pkg/front_end/testcases/nnbd/late.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/late.dart.strong.transformed.expect
index 5ae8065b0c5..d7a7a5d7fb3 100644
--- a/pkg/front_end/testcases/nnbd/late.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/late.dart.strong.transformed.expect
@@ -10,7 +10,7 @@ library;
 //     lateFinalStaticFieldWithInit = 0;
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
 //     lateFinalInstanceFieldWithInit = 0;
@@ -24,7 +24,7 @@ library;
 //   Class.lateFinalStaticFieldWithInit = 0;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
 //   c.lateFinalInstanceFieldWithInit = 0;
@@ -63,7 +63,7 @@ class Class extends core::Object {
     invalid-expression "pkg/front_end/testcases/nnbd/late.dart:40:5: Error: Can't assign to the final variable 'lateFinalVariableWithInit'.
     lateFinalVariableWithInit = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+    invalid-expression "pkg/front_end/testcases/nnbd/late.dart:42:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
     lateFinalInstanceFieldWithInit = 0;
@@ -93,7 +93,7 @@ static method errors() → dynamic {
   lateFinalTopLevelFieldWithInit = 0;
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   self::Class c = new self::Class::•();
-  invalid-expression "pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/late.dart:65:5: Error: The setter 'lateFinalInstanceFieldWithInit' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/late.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'lateFinalInstanceFieldWithInit'.
   c.lateFinalInstanceFieldWithInit = 0;
diff --git a/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.expect b/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.expect
index 12073aaa2b0..9a52ac1d9ce 100644
--- a/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.expect
@@ -2,42 +2,42 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   y.foo(); // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
 //   y.bar; // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'baz'.
 //   y.baz = 42; // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   y(); // Error.
 //    ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //   y++; // Error.
 //    ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //   y += 1; // Error.
 //     ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //   y[42]; // Error.
 //    ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //   y[42] = 42; // Error.
 //    ^
@@ -67,35 +67,35 @@ static method foo(Never x, Never? y) → dynamic {
   let final Never #t9 = x in #t9 == null ?{core::int?} null : #t9.{Never}baz = 42;
   let final Never #t10 = x in #t10 == null ?{Null} null : #t10{Never}.[](42);
   let final Never #t11 = x in #t11 == null ?{core::int?} null : #t11{Never}.[]=(42, 42);
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   y.foo(); // Error.
     ^^^" in y{<unresolved>}.foo();
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
   y.bar; // Error.
     ^^^" in y{<unresolved>}.bar;
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'baz'.
   y.baz = 42; // Error.
     ^^^" in y.{<unresolved>}baz = 42;
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   y(); // Error.
    ^" in y{<unresolved>}.call();
-  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the class 'Never?'.
+  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
   y++; // Error.
    ^" in y{<unresolved>}.+(1) as{TypeError,ForDynamic} Never?;
-  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the class 'Never?'.
+  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
   y += 1; // Error.
     ^" in y{<unresolved>}.+(1) as{TypeError,ForDynamic} Never?;
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
   y[42]; // Error.
    ^" in y{<unresolved>}.[](42);
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
   y[42] = 42; // Error.
    ^" in y{<unresolved>}.[]=(42, 42);
diff --git a/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.modular.expect
index 12073aaa2b0..9a52ac1d9ce 100644
--- a/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.modular.expect
@@ -2,42 +2,42 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   y.foo(); // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
 //   y.bar; // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'baz'.
 //   y.baz = 42; // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   y(); // Error.
 //    ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //   y++; // Error.
 //    ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //   y += 1; // Error.
 //     ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //   y[42]; // Error.
 //    ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //   y[42] = 42; // Error.
 //    ^
@@ -67,35 +67,35 @@ static method foo(Never x, Never? y) → dynamic {
   let final Never #t9 = x in #t9 == null ?{core::int?} null : #t9.{Never}baz = 42;
   let final Never #t10 = x in #t10 == null ?{Null} null : #t10{Never}.[](42);
   let final Never #t11 = x in #t11 == null ?{core::int?} null : #t11{Never}.[]=(42, 42);
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   y.foo(); // Error.
     ^^^" in y{<unresolved>}.foo();
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
   y.bar; // Error.
     ^^^" in y{<unresolved>}.bar;
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'baz'.
   y.baz = 42; // Error.
     ^^^" in y.{<unresolved>}baz = 42;
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   y(); // Error.
    ^" in y{<unresolved>}.call();
-  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the class 'Never?'.
+  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
   y++; // Error.
    ^" in y{<unresolved>}.+(1) as{TypeError,ForDynamic} Never?;
-  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the class 'Never?'.
+  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
   y += 1; // Error.
     ^" in y{<unresolved>}.+(1) as{TypeError,ForDynamic} Never?;
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
   y[42]; // Error.
    ^" in y{<unresolved>}.[](42);
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
   y[42] = 42; // Error.
    ^" in y{<unresolved>}.[]=(42, 42);
diff --git a/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.transformed.expect
index 0e4756ea76c..3fcb7788890 100644
--- a/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.transformed.expect
@@ -2,42 +2,42 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'foo'.
 //   y.foo(); // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
 //   y.bar; // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'baz'.
 //   y.baz = 42; // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the type 'Never?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   y(); // Error.
 //    ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //   y++; // Error.
 //    ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '+' operator.
 //   y += 1; // Error.
 //     ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '[]' operator.
 //   y[42]; // Error.
 //    ^
 //
-// pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the class 'Never?'.
+// pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the type 'Never?'.
 // Try correcting the operator to an existing operator, or defining a '[]=' operator.
 //   y[42] = 42; // Error.
 //    ^
@@ -67,35 +67,35 @@ static method foo(Never x, Never? y) → dynamic {
   let final Never #t9 = x in #t9 == null ?{core::int?} null : #t9.{Never}baz = 42;
   let final Never #t10 = x in #t10 == null ?{Null} null : #t10{Never}.[](42);
   let final Never #t11 = x in #t11 == null ?{core::int?} null : #t11{Never}.[]=(42, 42);
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:30:5: Error: The method 'foo' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing method, or defining a method named 'foo'.
   y.foo(); // Error.
     ^^^" in y{<unresolved>}.foo();
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:31:5: Error: The getter 'bar' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
   y.bar; // Error.
     ^^^" in y{<unresolved>}.bar;
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'baz'.
   y.baz = 42; // Error.
     ^^^" in y.{<unresolved>}baz = 42;
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:33:4: Error: The method 'call' isn't defined for the type 'Never?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   y(); // Error.
    ^" in y{<unresolved>}.call();
-  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the class 'Never?'.
+  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:34:4: Error: The operator '+' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
   y++; // Error.
    ^" in y{<unresolved>}.+(1) as{TypeError,ForDynamic,Unchecked} Never?;
-  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the class 'Never?'.
+  y = invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:35:5: Error: The operator '+' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '+' operator.
   y += 1; // Error.
     ^" in y{<unresolved>}.+(1) as{TypeError,ForDynamic,Unchecked} Never?;
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:36:4: Error: The operator '[]' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '[]' operator.
   y[42]; // Error.
    ^" in y{<unresolved>}.[](42);
-  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the class 'Never?'.
+  invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:37:4: Error: The operator '[]=' isn't defined for the type 'Never?'.
 Try correcting the operator to an existing operator, or defining a '[]=' operator.
   y[42] = 42; // Error.
    ^" in y{<unresolved>}.[]=(42, 42);
diff --git a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.expect b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.expect
index d7f050ab206..f3df579ef93 100644
--- a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.expect
@@ -163,35 +163,35 @@ library;
 //   Extension.extensionInstanceMethodAndStaticSetter =
 //                                                    ^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter'.
 //   c.instanceMethodAndSetter = c.instanceMethodAndSetter();
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticMethodAndInstanceSetter'.
 //   c.staticMethodAndInstanceSetter = Class.staticMethodAndInstanceSetter();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'Class'.
 //   c.Class = c.Class;
 //               ^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'extensionInstanceMethodAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
 //                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticMethodAndInstanceSetter'.
 //   0.extensionStaticMethodAndInstanceSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -242,7 +242,7 @@ static method test() → dynamic {
   classAndSetter = classAndSetter();
                  ^";
   self::Class c = new self::Class::•();
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter'.
   c.instanceMethodAndSetter = c.instanceMethodAndSetter();
@@ -250,7 +250,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:55:31: Error: Can't assign to this.
   Class.staticMethodAndSetter = Class.staticMethodAndSetter();
                               ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticMethodAndInstanceSetter'.
   c.staticMethodAndInstanceSetter = Class.staticMethodAndInstanceSetter();
@@ -260,22 +260,22 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:59:39: Error: Can't assign to this.
   Class.instanceMethodAndStaticSetter = c.instanceMethodAndStaticSetter();
                                       ^";
-  c.{self::Class::Class} = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the class 'Class'.
+  c.{self::Class::Class} = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'Class'.
   c.Class = c.Class;
               ^^^^^" in c{<unresolved>}.Class;
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'extensionInstanceMethodAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceMethodAndSetter();
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:65:44: Error: Can't assign to this.
   Extension.extensionStaticMethodAndSetter =
                                            ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticMethodAndInstanceSetter'.
   0.extensionStaticMethodAndInstanceSetter =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticMethodAndInstanceSetter = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:69:17: Error: Can't use 'extensionStaticMethodAndInstanceSetter' because it is declared more than once.
diff --git a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.modular.expect
index d7f050ab206..f3df579ef93 100644
--- a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.modular.expect
@@ -163,35 +163,35 @@ library;
 //   Extension.extensionInstanceMethodAndStaticSetter =
 //                                                    ^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter'.
 //   c.instanceMethodAndSetter = c.instanceMethodAndSetter();
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticMethodAndInstanceSetter'.
 //   c.staticMethodAndInstanceSetter = Class.staticMethodAndInstanceSetter();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'Class'.
 //   c.Class = c.Class;
 //               ^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'extensionInstanceMethodAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
 //                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticMethodAndInstanceSetter'.
 //   0.extensionStaticMethodAndInstanceSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -242,7 +242,7 @@ static method test() → dynamic {
   classAndSetter = classAndSetter();
                  ^";
   self::Class c = new self::Class::•();
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter'.
   c.instanceMethodAndSetter = c.instanceMethodAndSetter();
@@ -250,7 +250,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:55:31: Error: Can't assign to this.
   Class.staticMethodAndSetter = Class.staticMethodAndSetter();
                               ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticMethodAndInstanceSetter'.
   c.staticMethodAndInstanceSetter = Class.staticMethodAndInstanceSetter();
@@ -260,22 +260,22 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:59:39: Error: Can't assign to this.
   Class.instanceMethodAndStaticSetter = c.instanceMethodAndStaticSetter();
                                       ^";
-  c.{self::Class::Class} = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the class 'Class'.
+  c.{self::Class::Class} = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'Class'.
   c.Class = c.Class;
               ^^^^^" in c{<unresolved>}.Class;
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'extensionInstanceMethodAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceMethodAndSetter();
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:65:44: Error: Can't assign to this.
   Extension.extensionStaticMethodAndSetter =
                                            ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticMethodAndInstanceSetter'.
   0.extensionStaticMethodAndInstanceSetter =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticMethodAndInstanceSetter = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:69:17: Error: Can't use 'extensionStaticMethodAndInstanceSetter' because it is declared more than once.
diff --git a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.transformed.expect
index d7f050ab206..f3df579ef93 100644
--- a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.strong.transformed.expect
@@ -163,35 +163,35 @@ library;
 //   Extension.extensionInstanceMethodAndStaticSetter =
 //                                                    ^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter'.
 //   c.instanceMethodAndSetter = c.instanceMethodAndSetter();
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticMethodAndInstanceSetter'.
 //   c.staticMethodAndInstanceSetter = Class.staticMethodAndInstanceSetter();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'Class'.
 //   c.Class = c.Class;
 //               ^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'extensionInstanceMethodAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
 //                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
 //   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the class 'int'.
+// pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticMethodAndInstanceSetter'.
 //   0.extensionStaticMethodAndInstanceSetter =
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -242,7 +242,7 @@ static method test() → dynamic {
   classAndSetter = classAndSetter();
                  ^";
   self::Class c = new self::Class::•();
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:53:5: Error: The setter 'instanceMethodAndSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'instanceMethodAndSetter'.
   c.instanceMethodAndSetter = c.instanceMethodAndSetter();
@@ -250,7 +250,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:55:31: Error: Can't assign to this.
   Class.staticMethodAndSetter = Class.staticMethodAndSetter();
                               ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:57:5: Error: The setter 'staticMethodAndInstanceSetter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'staticMethodAndInstanceSetter'.
   c.staticMethodAndInstanceSetter = Class.staticMethodAndInstanceSetter();
@@ -260,22 +260,22 @@ Try correcting the name to the name of an existing setter, or defining a setter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:59:39: Error: Can't assign to this.
   Class.instanceMethodAndStaticSetter = c.instanceMethodAndStaticSetter();
                                       ^";
-  c.{self::Class::Class} = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the class 'Class'.
+  c.{self::Class::Class} = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:61:15: Error: The getter 'Class' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'Class'.
   c.Class = c.Class;
               ^^^^^" in c{<unresolved>}.Class;
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionInstanceFieldAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the class 'int'.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:41: Error: The method 'extensionInstanceMethodAndSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'extensionInstanceMethodAndSetter'.
   0.extensionInstanceFieldAndSetter = 0.extensionInstanceMethodAndSetter();
                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0{<unresolved>}.extensionInstanceMethodAndSetter();
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:65:44: Error: Can't assign to this.
   Extension.extensionStaticMethodAndSetter =
                                            ^";
-  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:68:5: Error: The setter 'extensionStaticMethodAndInstanceSetter' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'extensionStaticMethodAndInstanceSetter'.
   0.extensionStaticMethodAndInstanceSetter =
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticMethodAndInstanceSetter = invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:69:17: Error: Can't use 'extensionStaticMethodAndInstanceSetter' because it is declared more than once.
diff --git a/pkg/front_end/testcases/none/method_invocation.dart.strong.expect b/pkg/front_end/testcases/none/method_invocation.dart.strong.expect
index a3bd536b0f8..0782b8d4263 100644
--- a/pkg/front_end/testcases/none/method_invocation.dart.strong.expect
+++ b/pkg/front_end/testcases/none/method_invocation.dart.strong.expect
@@ -60,7 +60,7 @@ library;
 //   nullableClass1.method(0);
 //                  ^^^^^^
 //
-// pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/none/method_invocation.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 //   nonNullableClass1.unresolved();
@@ -201,7 +201,7 @@ Try calling using ?. instead.
   never{Never}.method(0);
   never{Never}.toString();
   core::print("DynamicInvocation (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/none/method_invocation.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
   nonNullableClass1.unresolved();
diff --git a/pkg/front_end/testcases/none/method_invocation.dart.strong.modular.expect b/pkg/front_end/testcases/none/method_invocation.dart.strong.modular.expect
index a3bd536b0f8..0782b8d4263 100644
--- a/pkg/front_end/testcases/none/method_invocation.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/none/method_invocation.dart.strong.modular.expect
@@ -60,7 +60,7 @@ library;
 //   nullableClass1.method(0);
 //                  ^^^^^^
 //
-// pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/none/method_invocation.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 //   nonNullableClass1.unresolved();
@@ -201,7 +201,7 @@ Try calling using ?. instead.
   never{Never}.method(0);
   never{Never}.toString();
   core::print("DynamicInvocation (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/none/method_invocation.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
   nonNullableClass1.unresolved();
diff --git a/pkg/front_end/testcases/none/method_invocation.dart.strong.transformed.expect b/pkg/front_end/testcases/none/method_invocation.dart.strong.transformed.expect
index f3d99f63e8b..ddbba911edf 100644
--- a/pkg/front_end/testcases/none/method_invocation.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/none/method_invocation.dart.strong.transformed.expect
@@ -60,7 +60,7 @@ library;
 //   nullableClass1.method(0);
 //                  ^^^^^^
 //
-// pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/none/method_invocation.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
 //   nonNullableClass1.unresolved();
@@ -201,7 +201,7 @@ Try calling using ?. instead.
   never{Never}.method(0);
   never{Never}.toString();
   core::print("DynamicInvocation (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/none/method_invocation.dart:102:21: Error: The method 'unresolved' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/none/method_invocation.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'unresolved'.
   nonNullableClass1.unresolved();
diff --git a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.expect b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.expect
index 91133c1b81c..099ac791e22 100644
--- a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.expect
+++ b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.expect
@@ -7,7 +7,7 @@ library;
 //   int? getter => null;
 //        ^^^^^^
 //
-// pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/none/new_method_invocation_encodings.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
 //   c.setter = c.getter;
@@ -28,7 +28,7 @@ class Class extends core::Object {
 }
 static method test(self::Class c, dynamic d, core::Function f1, () → void f2) → dynamic {
   c.{self::Class::field} = c.{self::Class::field}{core::int?};
-  invalid-expression "pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/none/new_method_invocation_encodings.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
   c.setter = c.getter;
diff --git a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.modular.expect b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.modular.expect
index 91133c1b81c..099ac791e22 100644
--- a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.modular.expect
@@ -7,7 +7,7 @@ library;
 //   int? getter => null;
 //        ^^^^^^
 //
-// pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/none/new_method_invocation_encodings.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
 //   c.setter = c.getter;
@@ -28,7 +28,7 @@ class Class extends core::Object {
 }
 static method test(self::Class c, dynamic d, core::Function f1, () → void f2) → dynamic {
   c.{self::Class::field} = c.{self::Class::field}{core::int?};
-  invalid-expression "pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/none/new_method_invocation_encodings.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
   c.setter = c.getter;
diff --git a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.transformed.expect b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.transformed.expect
index 91133c1b81c..099ac791e22 100644
--- a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.strong.transformed.expect
@@ -7,7 +7,7 @@ library;
 //   int? getter => null;
 //        ^^^^^^
 //
-// pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/none/new_method_invocation_encodings.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
 //   c.setter = c.getter;
@@ -28,7 +28,7 @@ class Class extends core::Object {
 }
 static method test(self::Class c, dynamic d, core::Function f1, () → void f2) → dynamic {
   c.{self::Class::field} = c.{self::Class::field}{core::int?};
-  invalid-expression "pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the class 'Class'.
+  invalid-expression "pkg/front_end/testcases/none/new_method_invocation_encodings.dart:14:5: Error: The setter 'setter' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/none/new_method_invocation_encodings.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'setter'.
   c.setter = c.getter;
diff --git a/pkg/front_end/testcases/none/operator.dart.strong.expect b/pkg/front_end/testcases/none/operator.dart.strong.expect
index 90a598a6acb..6f22e1c6d55 100644
--- a/pkg/front_end/testcases/none/operator.dart.strong.expect
+++ b/pkg/front_end/testcases/none/operator.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the class 'String'.
+// pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the type 'String'.
 // Try correcting the operator to an existing operator, or defining a '-' operator.
 //   string - 42;
 //          ^
@@ -11,7 +11,7 @@ library;
 //   -c.method();
 //            ^
 //
-// pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the class 'String'.
+// pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the type 'String'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 //   -string;
 //   ^
@@ -81,7 +81,7 @@ static method add(core::num n, core::int i, core::double d, self::Class<core::St
   core::print("DynamicInvocation (Never)");
   never{Never}.+(n);
   core::print("DynamicInvocation (Invalid)");
-  invalid-expression "pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the class 'String'.
+  invalid-expression "pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the type 'String'.
 Try correcting the operator to an existing operator, or defining a '-' operator.
   string - 42;
          ^" in string{<unresolved>}.-(42);
@@ -101,7 +101,7 @@ static method unaryMinus(core::num n, core::int i, core::double d, self::Class<c
   -c.method();
            ^" in c.{self::Class::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.unary-();
   core::print("DynamicInvocation (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the class 'String'.
+  invalid-expression "pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the type 'String'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
   -string;
   ^" in string{<unresolved>}.unary-();
diff --git a/pkg/front_end/testcases/none/operator.dart.strong.modular.expect b/pkg/front_end/testcases/none/operator.dart.strong.modular.expect
index 90a598a6acb..6f22e1c6d55 100644
--- a/pkg/front_end/testcases/none/operator.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/none/operator.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the class 'String'.
+// pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the type 'String'.
 // Try correcting the operator to an existing operator, or defining a '-' operator.
 //   string - 42;
 //          ^
@@ -11,7 +11,7 @@ library;
 //   -c.method();
 //            ^
 //
-// pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the class 'String'.
+// pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the type 'String'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 //   -string;
 //   ^
@@ -81,7 +81,7 @@ static method add(core::num n, core::int i, core::double d, self::Class<core::St
   core::print("DynamicInvocation (Never)");
   never{Never}.+(n);
   core::print("DynamicInvocation (Invalid)");
-  invalid-expression "pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the class 'String'.
+  invalid-expression "pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the type 'String'.
 Try correcting the operator to an existing operator, or defining a '-' operator.
   string - 42;
          ^" in string{<unresolved>}.-(42);
@@ -101,7 +101,7 @@ static method unaryMinus(core::num n, core::int i, core::double d, self::Class<c
   -c.method();
            ^" in c.{self::Class::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.unary-();
   core::print("DynamicInvocation (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the class 'String'.
+  invalid-expression "pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the type 'String'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
   -string;
   ^" in string{<unresolved>}.unary-();
diff --git a/pkg/front_end/testcases/none/operator.dart.strong.transformed.expect b/pkg/front_end/testcases/none/operator.dart.strong.transformed.expect
index 5ac1e414907..ab481a23505 100644
--- a/pkg/front_end/testcases/none/operator.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/none/operator.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the class 'String'.
+// pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the type 'String'.
 // Try correcting the operator to an existing operator, or defining a '-' operator.
 //   string - 42;
 //          ^
@@ -11,7 +11,7 @@ library;
 //   -c.method();
 //            ^
 //
-// pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the class 'String'.
+// pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the type 'String'.
 // Try correcting the operator to an existing operator, or defining a 'unary-' operator.
 //   -string;
 //   ^
@@ -81,7 +81,7 @@ static method add(core::num n, core::int i, core::double d, self::Class<core::St
   core::print("DynamicInvocation (Never)");
   never{Never}.+(n);
   core::print("DynamicInvocation (Invalid)");
-  invalid-expression "pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the class 'String'.
+  invalid-expression "pkg/front_end/testcases/none/operator.dart:48:10: Error: The operator '-' isn't defined for the type 'String'.
 Try correcting the operator to an existing operator, or defining a '-' operator.
   string - 42;
          ^" in string{<unresolved>}.-(42);
@@ -101,7 +101,7 @@ static method unaryMinus(core::num n, core::int i, core::double d, self::Class<c
   -c.method();
            ^" in c.{self::Class::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.unary-();
   core::print("DynamicInvocation (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the class 'String'.
+  invalid-expression "pkg/front_end/testcases/none/operator.dart:69:3: Error: The operator 'unary-' isn't defined for the type 'String'.
 Try correcting the operator to an existing operator, or defining a 'unary-' operator.
   -string;
   ^" in string{<unresolved>}.unary-();
diff --git a/pkg/front_end/testcases/none/property_get.dart.strong.expect b/pkg/front_end/testcases/none/property_get.dart.strong.expect
index e999fb4c789..b5d52642572 100644
--- a/pkg/front_end/testcases/none/property_get.dart.strong.expect
+++ b/pkg/front_end/testcases/none/property_get.dart.strong.expect
@@ -26,7 +26,7 @@ library;
 //   nonNullableClass1.method().field;
 //                           ^
 //
-// pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/none/property_get.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //   nonNullableClass1.unresolved;
@@ -133,7 +133,7 @@ static method test<T1 extends core::Function, T2 extends () → core::int>(self:
   nonNullableClass1.method().field;
                           ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.field;
   core::print("DynamicGet (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/none/property_get.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
   nonNullableClass1.unresolved;
diff --git a/pkg/front_end/testcases/none/property_get.dart.strong.modular.expect b/pkg/front_end/testcases/none/property_get.dart.strong.modular.expect
index e999fb4c789..b5d52642572 100644
--- a/pkg/front_end/testcases/none/property_get.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/none/property_get.dart.strong.modular.expect
@@ -26,7 +26,7 @@ library;
 //   nonNullableClass1.method().field;
 //                           ^
 //
-// pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/none/property_get.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //   nonNullableClass1.unresolved;
@@ -133,7 +133,7 @@ static method test<T1 extends core::Function, T2 extends () → core::int>(self:
   nonNullableClass1.method().field;
                           ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.field;
   core::print("DynamicGet (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/none/property_get.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
   nonNullableClass1.unresolved;
diff --git a/pkg/front_end/testcases/none/property_get.dart.strong.transformed.expect b/pkg/front_end/testcases/none/property_get.dart.strong.transformed.expect
index e999fb4c789..b5d52642572 100644
--- a/pkg/front_end/testcases/none/property_get.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/none/property_get.dart.strong.transformed.expect
@@ -26,7 +26,7 @@ library;
 //   nonNullableClass1.method().field;
 //                           ^
 //
-// pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/none/property_get.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
 //   nonNullableClass1.unresolved;
@@ -133,7 +133,7 @@ static method test<T1 extends core::Function, T2 extends () → core::int>(self:
   nonNullableClass1.method().field;
                           ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.field;
   core::print("DynamicGet (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/none/property_get.dart:113:21: Error: The getter 'unresolved' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/none/property_get.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
   nonNullableClass1.unresolved;
diff --git a/pkg/front_end/testcases/none/property_set.dart.strong.expect b/pkg/front_end/testcases/none/property_set.dart.strong.expect
index 7115d2559cf..fa3af9d208d 100644
--- a/pkg/front_end/testcases/none/property_set.dart.strong.expect
+++ b/pkg/front_end/testcases/none/property_set.dart.strong.expect
@@ -22,7 +22,7 @@ library;
 //   nonNullableClass1.method().field = 42;
 //                           ^
 //
-// pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/none/property_set.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //   nonNullableClass1.unresolved = 42;
@@ -58,7 +58,7 @@ static method test(self::Class1 nonNullableClass1, self::Class1? nullableClass1,
   nonNullableClass1.method().field = 42;
                           ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}.{<invalid>}field = 42;
   core::print("DynamicSet (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/none/property_set.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
   nonNullableClass1.unresolved = 42;
diff --git a/pkg/front_end/testcases/none/property_set.dart.strong.modular.expect b/pkg/front_end/testcases/none/property_set.dart.strong.modular.expect
index 7115d2559cf..fa3af9d208d 100644
--- a/pkg/front_end/testcases/none/property_set.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/none/property_set.dart.strong.modular.expect
@@ -22,7 +22,7 @@ library;
 //   nonNullableClass1.method().field = 42;
 //                           ^
 //
-// pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/none/property_set.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //   nonNullableClass1.unresolved = 42;
@@ -58,7 +58,7 @@ static method test(self::Class1 nonNullableClass1, self::Class1? nullableClass1,
   nonNullableClass1.method().field = 42;
                           ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}.{<invalid>}field = 42;
   core::print("DynamicSet (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/none/property_set.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
   nonNullableClass1.unresolved = 42;
diff --git a/pkg/front_end/testcases/none/property_set.dart.strong.transformed.expect b/pkg/front_end/testcases/none/property_set.dart.strong.transformed.expect
index 7115d2559cf..fa3af9d208d 100644
--- a/pkg/front_end/testcases/none/property_set.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/none/property_set.dart.strong.transformed.expect
@@ -22,7 +22,7 @@ library;
 //   nonNullableClass1.method().field = 42;
 //                           ^
 //
-// pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the class 'Class1'.
+// pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the type 'Class1'.
 //  - 'Class1' is from 'pkg/front_end/testcases/none/property_set.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
 //   nonNullableClass1.unresolved = 42;
@@ -58,7 +58,7 @@ static method test(self::Class1 nonNullableClass1, self::Class1? nullableClass1,
   nonNullableClass1.method().field = 42;
                           ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}.{<invalid>}field = 42;
   core::print("DynamicSet (Unresolved)");
-  invalid-expression "pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the class 'Class1'.
+  invalid-expression "pkg/front_end/testcases/none/property_set.dart:32:21: Error: The setter 'unresolved' isn't defined for the type 'Class1'.
  - 'Class1' is from 'pkg/front_end/testcases/none/property_set.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
   nonNullableClass1.unresolved = 42;
diff --git a/pkg/front_end/testcases/patterns/issue51437.dart.strong.expect b/pkg/front_end/testcases/patterns/issue51437.dart.strong.expect
index fcce66da671..4cdb5455720 100644
--- a/pkg/front_end/testcases/patterns/issue51437.dart.strong.expect
+++ b/pkg/front_end/testcases/patterns/issue51437.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'arglebargle'.
 //       x.arglebargle; // Error
@@ -30,7 +30,7 @@ static method foo<X extends core::Object? = dynamic>(self::A<self::foo::X%> it)
       hoisted self::foo::X% x;
       if(let final dynamic #t1 = x = self::_extension#0|get#g<self::foo::X%>(#0#0) in true) {
         {
-          invalid-expression "pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the class 'Object?'.
+          invalid-expression "pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'arglebargle'.
       x.arglebargle; // Error
diff --git a/pkg/front_end/testcases/patterns/issue51437.dart.strong.modular.expect b/pkg/front_end/testcases/patterns/issue51437.dart.strong.modular.expect
index fcce66da671..4cdb5455720 100644
--- a/pkg/front_end/testcases/patterns/issue51437.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/patterns/issue51437.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'arglebargle'.
 //       x.arglebargle; // Error
@@ -30,7 +30,7 @@ static method foo<X extends core::Object? = dynamic>(self::A<self::foo::X%> it)
       hoisted self::foo::X% x;
       if(let final dynamic #t1 = x = self::_extension#0|get#g<self::foo::X%>(#0#0) in true) {
         {
-          invalid-expression "pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the class 'Object?'.
+          invalid-expression "pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'arglebargle'.
       x.arglebargle; // Error
diff --git a/pkg/front_end/testcases/patterns/issue51437.dart.strong.transformed.expect b/pkg/front_end/testcases/patterns/issue51437.dart.strong.transformed.expect
index fcce66da671..4cdb5455720 100644
--- a/pkg/front_end/testcases/patterns/issue51437.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/patterns/issue51437.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the class 'Object?'.
+// pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the type 'Object?'.
 //  - 'Object' is from 'dart:core'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'arglebargle'.
 //       x.arglebargle; // Error
@@ -30,7 +30,7 @@ static method foo<X extends core::Object? = dynamic>(self::A<self::foo::X%> it)
       hoisted self::foo::X% x;
       if(let final dynamic #t1 = x = self::_extension#0|get#g<self::foo::X%>(#0#0) in true) {
         {
-          invalid-expression "pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the class 'Object?'.
+          invalid-expression "pkg/front_end/testcases/patterns/issue51437.dart:17:9: Error: The getter 'arglebargle' isn't defined for the type 'Object?'.
  - 'Object' is from 'dart:core'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'arglebargle'.
       x.arglebargle; // Error
diff --git a/pkg/front_end/testcases/patterns/pattern_types.dart.strong.expect b/pkg/front_end/testcases/patterns/pattern_types.dart.strong.expect
index 3d8ad295717..278c053d685 100644
--- a/pkg/front_end/testcases/patterns/pattern_types.dart.strong.expect
+++ b/pkg/front_end/testcases/patterns/pattern_types.dart.strong.expect
@@ -14,52 +14,52 @@ library;
 //     case Invalid(: field): // invalid get
 //                  ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'missing'.
 //     case Class(: var missing): // Error: missing getter
 //                ^^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
 //     case Class_(: var field): // Error: nullable member get
 //                 ^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'method'.
 //     case Class_(: var method): // Error: nullable member tear-off
 //                 ^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionGetter'.
 //     case Class_(: var extensionGetter): // Error: nullable extension member get
 //                 ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionMethod'.
 //     case Class_(: var extensionMethod): // Error: nullable extension tear-off
 //                 ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the class 'void Function()?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the type 'void Function()?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'call'.
 //     case Function1_(: var call): // Error: nullable function tear-off
 //                     ^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '$1' isn't defined for the class '(int, {String named})?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '$1' isn't defined for the type '(int, {String named})?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$1'.
 //     case Record1_(: var $1): // Error: nullable record index get
 //                   ^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the class '(int, {String named})?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the type '(int, {String named})?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //     case Record1_(: var named): // Error: nullable record named get
 //                   ^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'ambiguousField'.
 //     case Class(: var ambiguousField): // Error: ambiguous get
@@ -88,24 +88,24 @@ library;
 //   if (cls case > 0) {} // Error: invalid instance >
 //                ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '<'.
 //   if (cls_ case < 0) {} // Error: nullable instance <
 //                 ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '<='.
 //   if (cls_ case <= 0) {} // Error: nullable extension <=
 //                 ^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the class 'String'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '<'.
 //   if (string case < 0) {} // Error: missing <
 //                   ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the class 'String'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '<='.
 //   if (string case <= 0) {} // Error: ambiguous <=
 //                   ^^
@@ -227,69 +227,69 @@ static method objectPattern(dynamic o) → dynamic {
       lowered core::int $1#case#1;
       lowered core::String named#case#1;
       invalid-type ambiguousField;
-      if(#0#0 is Null && (let final dynamic #t1 = hashCode = #0#0{Null}.{core::Object::hashCode}{<object>}.{core::int} in true) || #0#0 is Null && (let final dynamic #t2 = toString = #0#0{Null}.{core::Object::toString}{<object>}.{() → core::String} in true) || #0#0 is self::Class && (let final dynamic #t3 = field#case#0 = #0#5#isSet ?{dynamic} #0#5{dynamic} : let final dynamic #t4 = #0#5#isSet = true in #0#5 = #0#0{self::Class}.{self::Class::field}{dynamic} in true) || #0#0 is self::Class && (let final dynamic #t5 = method#case#0 = #0#6#isSet ?{() → void} #0#6{() → void} : let final dynamic #t6 = #0#6#isSet = true in #0#6 = #0#0{self::Class}.{self::Class::method}{() → void} in true) || #0#0 is self::Class && (let final dynamic #t7 = extensionGetter#case#0 = self::_extension#0|get#extensionGetter(#0#0{self::Class}) in true) || #0#0 is self::Class && (let final dynamic #t8 = extensionMethod#case#0 = self::_extension#0|get#extensionMethod(#0#0{self::Class}) in true) || #0#0 is dynamic && (let final dynamic #t9 = dynamicAccess = #0#0{dynamic}.dynamicAccess in true) || #0#0 is () → void && (let final dynamic #t10 = call#case#0 = #0#12#isSet ?{() → void} #0#12{() → void} : let final dynamic #t11 = #0#12#isSet = true in #0#12 = #0#0{() → void}.call in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t12 = $1#case#0 = #0#14#isSet ?{core::int} #0#14{core::int} : let final dynamic #t13 = #0#14#isSet = true in #0#14 = #0#0{(core::int, {required named: core::String})}.$1{core::int} in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t14 = named#case#0 = #0#15#isSet ?{core::String} #0#15{core::String} : let final dynamic #t15 = #0#15#isSet = true in #0#15 = #0#0{(core::int, {required named: core::String})}.named{core::String} in true) || #0#0 is self::Class && (let final dynamic #t16 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the class 'Class'.
+      if(#0#0 is Null && (let final dynamic #t1 = hashCode = #0#0{Null}.{core::Object::hashCode}{<object>}.{core::int} in true) || #0#0 is Null && (let final dynamic #t2 = toString = #0#0{Null}.{core::Object::toString}{<object>}.{() → core::String} in true) || #0#0 is self::Class && (let final dynamic #t3 = field#case#0 = #0#5#isSet ?{dynamic} #0#5{dynamic} : let final dynamic #t4 = #0#5#isSet = true in #0#5 = #0#0{self::Class}.{self::Class::field}{dynamic} in true) || #0#0 is self::Class && (let final dynamic #t5 = method#case#0 = #0#6#isSet ?{() → void} #0#6{() → void} : let final dynamic #t6 = #0#6#isSet = true in #0#6 = #0#0{self::Class}.{self::Class::method}{() → void} in true) || #0#0 is self::Class && (let final dynamic #t7 = extensionGetter#case#0 = self::_extension#0|get#extensionGetter(#0#0{self::Class}) in true) || #0#0 is self::Class && (let final dynamic #t8 = extensionMethod#case#0 = self::_extension#0|get#extensionMethod(#0#0{self::Class}) in true) || #0#0 is dynamic && (let final dynamic #t9 = dynamicAccess = #0#0{dynamic}.dynamicAccess in true) || #0#0 is () → void && (let final dynamic #t10 = call#case#0 = #0#12#isSet ?{() → void} #0#12{() → void} : let final dynamic #t11 = #0#12#isSet = true in #0#12 = #0#0{() → void}.call in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t12 = $1#case#0 = #0#14#isSet ?{core::int} #0#14{core::int} : let final dynamic #t13 = #0#14#isSet = true in #0#14 = #0#0{(core::int, {required named: core::String})}.$1{core::int} in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t14 = named#case#0 = #0#15#isSet ?{core::String} #0#15{core::String} : let final dynamic #t15 = #0#15#isSet = true in #0#15 = #0#0{(core::int, {required named: core::String})}.named{core::String} in true) || #0#0 is self::Class && (let final dynamic #t16 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missing'.
     case Class(: var missing): // Error: missing getter
-               ^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the class 'Class'.
+               ^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missing'.
     case Class(: var missing): // Error: missing getter
-               ^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t17 = #0#5#isSet ?{invalid-type} #0#5{invalid-type} : let final dynamic #t18 = #0#5#isSet = true in #0#5 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the class 'Class?'.
+               ^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t17 = #0#5#isSet ?{invalid-type} #0#5{invalid-type} : let final dynamic #t18 = #0#5#isSet = true in #0#5 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
     case Class_(: var field): // Error: nullable member get
-                ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the class 'Class?'.
+                ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
     case Class_(: var field): // Error: nullable member get
-                ^^^^^") || #0#0 is self::Class? && (let final dynamic #t19 = #0#6#isSet ?{invalid-type} #0#6{invalid-type} : let final dynamic #t20 = #0#6#isSet = true in #0#6 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the class 'Class?'.
+                ^^^^^") || #0#0 is self::Class? && (let final dynamic #t19 = #0#6#isSet ?{invalid-type} #0#6{invalid-type} : let final dynamic #t20 = #0#6#isSet = true in #0#6 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'method'.
     case Class_(: var method): // Error: nullable member tear-off
-                ^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the class 'Class?'.
+                ^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'method'.
     case Class_(: var method): // Error: nullable member tear-off
-                ^^^^^^") || #0#0 is self::Class? && (let final dynamic #t21 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the class 'Class?'.
+                ^^^^^^") || #0#0 is self::Class? && (let final dynamic #t21 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionGetter'.
     case Class_(: var extensionGetter): // Error: nullable extension member get
-                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the class 'Class?'.
+                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionGetter'.
     case Class_(: var extensionGetter): // Error: nullable extension member get
-                ^^^^^^^^^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t22 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the class 'Class?'.
+                ^^^^^^^^^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t22 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionMethod'.
     case Class_(: var extensionMethod): // Error: nullable extension tear-off
-                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the class 'Class?'.
+                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionMethod'.
     case Class_(: var extensionMethod): // Error: nullable extension tear-off
-                ^^^^^^^^^^^^^^^") || #0#0 is () →? void && (let final dynamic #t23 = #0#12#isSet ?{invalid-type} #0#12{invalid-type} : let final dynamic #t24 = #0#12#isSet = true in #0#12 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the class 'void Function()?'.
+                ^^^^^^^^^^^^^^^") || #0#0 is () →? void && (let final dynamic #t23 = #0#12#isSet ?{invalid-type} #0#12{invalid-type} : let final dynamic #t24 = #0#12#isSet = true in #0#12 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the type 'void Function()?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'call'.
     case Function1_(: var call): // Error: nullable function tear-off
-                    ^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the class 'void Function()?'.
+                    ^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the type 'void Function()?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'call'.
     case Function1_(: var call): // Error: nullable function tear-off
-                    ^^^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t25 = #0#14#isSet ?{invalid-type} #0#14{invalid-type} : let final dynamic #t26 = #0#14#isSet = true in #0#14 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the class '(int, {String named})?'.
+                    ^^^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t25 = #0#14#isSet ?{invalid-type} #0#14{invalid-type} : let final dynamic #t26 = #0#14#isSet = true in #0#14 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$1'.
     case Record1_(: var \$1): // Error: nullable record index get
-                  ^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the class '(int, {String named})?'.
+                  ^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$1'.
     case Record1_(: var \$1): // Error: nullable record index get
-                  ^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t27 = #0#15#isSet ?{invalid-type} #0#15{invalid-type} : let final dynamic #t28 = #0#15#isSet = true in #0#15 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the class '(int, {String named})?'.
+                  ^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t27 = #0#15#isSet ?{invalid-type} #0#15{invalid-type} : let final dynamic #t28 = #0#15#isSet = true in #0#15 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
     case Record1_(: var named): // Error: nullable record named get
-                  ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the class '(int, {String named})?'.
+                  ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
     case Record1_(: var named): // Error: nullable record named get
-                  ^^^^^") || #0#0 is self::Class && (let final dynamic #t29 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the class 'Class'.
+                  ^^^^^") || #0#0 is self::Class && (let final dynamic #t29 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'ambiguousField'.
     case Class(: var ambiguousField): // Error: ambiguous get
-               ^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the class 'Class'.
+               ^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'ambiguousField'.
     case Class(: var ambiguousField): // Error: ambiguous get
@@ -415,7 +415,7 @@ static method relationalPattern(dynamic dyn, Never never, self::Class cls, self:
   }
   {
     final synthesized self::Class? #22#0 = cls_;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the class 'Class?'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '<'.
   if (cls_ case < 0) {} // Error: nullable instance <
@@ -424,7 +424,7 @@ Try correcting the name to the name of an existing method, or defining a method
   }
   {
     final synthesized self::Class? #23#0 = cls_;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the class 'Class?'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '<='.
   if (cls_ case <= 0) {} // Error: nullable extension <=
@@ -433,7 +433,7 @@ Try correcting the name to the name of an existing method, or defining a method
   }
   {
     final synthesized core::String #24#0 = string;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the class 'String'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '<'.
   if (string case < 0) {} // Error: missing <
                   ^") {
@@ -441,7 +441,7 @@ Try correcting the name to the name of an existing method, or defining a method
   }
   {
     final synthesized core::String #25#0 = string;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the class 'String'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '<='.
   if (string case <= 0) {} // Error: ambiguous <=
                   ^^") {
diff --git a/pkg/front_end/testcases/patterns/pattern_types.dart.strong.modular.expect b/pkg/front_end/testcases/patterns/pattern_types.dart.strong.modular.expect
index 3d8ad295717..278c053d685 100644
--- a/pkg/front_end/testcases/patterns/pattern_types.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/patterns/pattern_types.dart.strong.modular.expect
@@ -14,52 +14,52 @@ library;
 //     case Invalid(: field): // invalid get
 //                  ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'missing'.
 //     case Class(: var missing): // Error: missing getter
 //                ^^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
 //     case Class_(: var field): // Error: nullable member get
 //                 ^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'method'.
 //     case Class_(: var method): // Error: nullable member tear-off
 //                 ^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionGetter'.
 //     case Class_(: var extensionGetter): // Error: nullable extension member get
 //                 ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionMethod'.
 //     case Class_(: var extensionMethod): // Error: nullable extension tear-off
 //                 ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the class 'void Function()?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the type 'void Function()?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'call'.
 //     case Function1_(: var call): // Error: nullable function tear-off
 //                     ^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '$1' isn't defined for the class '(int, {String named})?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '$1' isn't defined for the type '(int, {String named})?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$1'.
 //     case Record1_(: var $1): // Error: nullable record index get
 //                   ^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the class '(int, {String named})?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the type '(int, {String named})?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //     case Record1_(: var named): // Error: nullable record named get
 //                   ^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'ambiguousField'.
 //     case Class(: var ambiguousField): // Error: ambiguous get
@@ -88,24 +88,24 @@ library;
 //   if (cls case > 0) {} // Error: invalid instance >
 //                ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '<'.
 //   if (cls_ case < 0) {} // Error: nullable instance <
 //                 ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '<='.
 //   if (cls_ case <= 0) {} // Error: nullable extension <=
 //                 ^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the class 'String'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '<'.
 //   if (string case < 0) {} // Error: missing <
 //                   ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the class 'String'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '<='.
 //   if (string case <= 0) {} // Error: ambiguous <=
 //                   ^^
@@ -227,69 +227,69 @@ static method objectPattern(dynamic o) → dynamic {
       lowered core::int $1#case#1;
       lowered core::String named#case#1;
       invalid-type ambiguousField;
-      if(#0#0 is Null && (let final dynamic #t1 = hashCode = #0#0{Null}.{core::Object::hashCode}{<object>}.{core::int} in true) || #0#0 is Null && (let final dynamic #t2 = toString = #0#0{Null}.{core::Object::toString}{<object>}.{() → core::String} in true) || #0#0 is self::Class && (let final dynamic #t3 = field#case#0 = #0#5#isSet ?{dynamic} #0#5{dynamic} : let final dynamic #t4 = #0#5#isSet = true in #0#5 = #0#0{self::Class}.{self::Class::field}{dynamic} in true) || #0#0 is self::Class && (let final dynamic #t5 = method#case#0 = #0#6#isSet ?{() → void} #0#6{() → void} : let final dynamic #t6 = #0#6#isSet = true in #0#6 = #0#0{self::Class}.{self::Class::method}{() → void} in true) || #0#0 is self::Class && (let final dynamic #t7 = extensionGetter#case#0 = self::_extension#0|get#extensionGetter(#0#0{self::Class}) in true) || #0#0 is self::Class && (let final dynamic #t8 = extensionMethod#case#0 = self::_extension#0|get#extensionMethod(#0#0{self::Class}) in true) || #0#0 is dynamic && (let final dynamic #t9 = dynamicAccess = #0#0{dynamic}.dynamicAccess in true) || #0#0 is () → void && (let final dynamic #t10 = call#case#0 = #0#12#isSet ?{() → void} #0#12{() → void} : let final dynamic #t11 = #0#12#isSet = true in #0#12 = #0#0{() → void}.call in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t12 = $1#case#0 = #0#14#isSet ?{core::int} #0#14{core::int} : let final dynamic #t13 = #0#14#isSet = true in #0#14 = #0#0{(core::int, {required named: core::String})}.$1{core::int} in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t14 = named#case#0 = #0#15#isSet ?{core::String} #0#15{core::String} : let final dynamic #t15 = #0#15#isSet = true in #0#15 = #0#0{(core::int, {required named: core::String})}.named{core::String} in true) || #0#0 is self::Class && (let final dynamic #t16 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the class 'Class'.
+      if(#0#0 is Null && (let final dynamic #t1 = hashCode = #0#0{Null}.{core::Object::hashCode}{<object>}.{core::int} in true) || #0#0 is Null && (let final dynamic #t2 = toString = #0#0{Null}.{core::Object::toString}{<object>}.{() → core::String} in true) || #0#0 is self::Class && (let final dynamic #t3 = field#case#0 = #0#5#isSet ?{dynamic} #0#5{dynamic} : let final dynamic #t4 = #0#5#isSet = true in #0#5 = #0#0{self::Class}.{self::Class::field}{dynamic} in true) || #0#0 is self::Class && (let final dynamic #t5 = method#case#0 = #0#6#isSet ?{() → void} #0#6{() → void} : let final dynamic #t6 = #0#6#isSet = true in #0#6 = #0#0{self::Class}.{self::Class::method}{() → void} in true) || #0#0 is self::Class && (let final dynamic #t7 = extensionGetter#case#0 = self::_extension#0|get#extensionGetter(#0#0{self::Class}) in true) || #0#0 is self::Class && (let final dynamic #t8 = extensionMethod#case#0 = self::_extension#0|get#extensionMethod(#0#0{self::Class}) in true) || #0#0 is dynamic && (let final dynamic #t9 = dynamicAccess = #0#0{dynamic}.dynamicAccess in true) || #0#0 is () → void && (let final dynamic #t10 = call#case#0 = #0#12#isSet ?{() → void} #0#12{() → void} : let final dynamic #t11 = #0#12#isSet = true in #0#12 = #0#0{() → void}.call in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t12 = $1#case#0 = #0#14#isSet ?{core::int} #0#14{core::int} : let final dynamic #t13 = #0#14#isSet = true in #0#14 = #0#0{(core::int, {required named: core::String})}.$1{core::int} in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t14 = named#case#0 = #0#15#isSet ?{core::String} #0#15{core::String} : let final dynamic #t15 = #0#15#isSet = true in #0#15 = #0#0{(core::int, {required named: core::String})}.named{core::String} in true) || #0#0 is self::Class && (let final dynamic #t16 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missing'.
     case Class(: var missing): // Error: missing getter
-               ^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the class 'Class'.
+               ^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missing'.
     case Class(: var missing): // Error: missing getter
-               ^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t17 = #0#5#isSet ?{invalid-type} #0#5{invalid-type} : let final dynamic #t18 = #0#5#isSet = true in #0#5 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the class 'Class?'.
+               ^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t17 = #0#5#isSet ?{invalid-type} #0#5{invalid-type} : let final dynamic #t18 = #0#5#isSet = true in #0#5 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
     case Class_(: var field): // Error: nullable member get
-                ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the class 'Class?'.
+                ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
     case Class_(: var field): // Error: nullable member get
-                ^^^^^") || #0#0 is self::Class? && (let final dynamic #t19 = #0#6#isSet ?{invalid-type} #0#6{invalid-type} : let final dynamic #t20 = #0#6#isSet = true in #0#6 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the class 'Class?'.
+                ^^^^^") || #0#0 is self::Class? && (let final dynamic #t19 = #0#6#isSet ?{invalid-type} #0#6{invalid-type} : let final dynamic #t20 = #0#6#isSet = true in #0#6 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'method'.
     case Class_(: var method): // Error: nullable member tear-off
-                ^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the class 'Class?'.
+                ^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'method'.
     case Class_(: var method): // Error: nullable member tear-off
-                ^^^^^^") || #0#0 is self::Class? && (let final dynamic #t21 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the class 'Class?'.
+                ^^^^^^") || #0#0 is self::Class? && (let final dynamic #t21 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionGetter'.
     case Class_(: var extensionGetter): // Error: nullable extension member get
-                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the class 'Class?'.
+                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionGetter'.
     case Class_(: var extensionGetter): // Error: nullable extension member get
-                ^^^^^^^^^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t22 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the class 'Class?'.
+                ^^^^^^^^^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t22 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionMethod'.
     case Class_(: var extensionMethod): // Error: nullable extension tear-off
-                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the class 'Class?'.
+                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionMethod'.
     case Class_(: var extensionMethod): // Error: nullable extension tear-off
-                ^^^^^^^^^^^^^^^") || #0#0 is () →? void && (let final dynamic #t23 = #0#12#isSet ?{invalid-type} #0#12{invalid-type} : let final dynamic #t24 = #0#12#isSet = true in #0#12 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the class 'void Function()?'.
+                ^^^^^^^^^^^^^^^") || #0#0 is () →? void && (let final dynamic #t23 = #0#12#isSet ?{invalid-type} #0#12{invalid-type} : let final dynamic #t24 = #0#12#isSet = true in #0#12 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the type 'void Function()?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'call'.
     case Function1_(: var call): // Error: nullable function tear-off
-                    ^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the class 'void Function()?'.
+                    ^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the type 'void Function()?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'call'.
     case Function1_(: var call): // Error: nullable function tear-off
-                    ^^^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t25 = #0#14#isSet ?{invalid-type} #0#14{invalid-type} : let final dynamic #t26 = #0#14#isSet = true in #0#14 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the class '(int, {String named})?'.
+                    ^^^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t25 = #0#14#isSet ?{invalid-type} #0#14{invalid-type} : let final dynamic #t26 = #0#14#isSet = true in #0#14 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$1'.
     case Record1_(: var \$1): // Error: nullable record index get
-                  ^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the class '(int, {String named})?'.
+                  ^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$1'.
     case Record1_(: var \$1): // Error: nullable record index get
-                  ^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t27 = #0#15#isSet ?{invalid-type} #0#15{invalid-type} : let final dynamic #t28 = #0#15#isSet = true in #0#15 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the class '(int, {String named})?'.
+                  ^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t27 = #0#15#isSet ?{invalid-type} #0#15{invalid-type} : let final dynamic #t28 = #0#15#isSet = true in #0#15 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
     case Record1_(: var named): // Error: nullable record named get
-                  ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the class '(int, {String named})?'.
+                  ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
     case Record1_(: var named): // Error: nullable record named get
-                  ^^^^^") || #0#0 is self::Class && (let final dynamic #t29 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the class 'Class'.
+                  ^^^^^") || #0#0 is self::Class && (let final dynamic #t29 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'ambiguousField'.
     case Class(: var ambiguousField): // Error: ambiguous get
-               ^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the class 'Class'.
+               ^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'ambiguousField'.
     case Class(: var ambiguousField): // Error: ambiguous get
@@ -415,7 +415,7 @@ static method relationalPattern(dynamic dyn, Never never, self::Class cls, self:
   }
   {
     final synthesized self::Class? #22#0 = cls_;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the class 'Class?'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '<'.
   if (cls_ case < 0) {} // Error: nullable instance <
@@ -424,7 +424,7 @@ Try correcting the name to the name of an existing method, or defining a method
   }
   {
     final synthesized self::Class? #23#0 = cls_;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the class 'Class?'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '<='.
   if (cls_ case <= 0) {} // Error: nullable extension <=
@@ -433,7 +433,7 @@ Try correcting the name to the name of an existing method, or defining a method
   }
   {
     final synthesized core::String #24#0 = string;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the class 'String'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '<'.
   if (string case < 0) {} // Error: missing <
                   ^") {
@@ -441,7 +441,7 @@ Try correcting the name to the name of an existing method, or defining a method
   }
   {
     final synthesized core::String #25#0 = string;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the class 'String'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '<='.
   if (string case <= 0) {} // Error: ambiguous <=
                   ^^") {
diff --git a/pkg/front_end/testcases/patterns/pattern_types.dart.strong.transformed.expect b/pkg/front_end/testcases/patterns/pattern_types.dart.strong.transformed.expect
index 5f1126bdeb2..ec474d98511 100644
--- a/pkg/front_end/testcases/patterns/pattern_types.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/patterns/pattern_types.dart.strong.transformed.expect
@@ -14,52 +14,52 @@ library;
 //     case Invalid(: field): // invalid get
 //                  ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'missing'.
 //     case Class(: var missing): // Error: missing getter
 //                ^^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
 //     case Class_(: var field): // Error: nullable member get
 //                 ^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'method'.
 //     case Class_(: var method): // Error: nullable member tear-off
 //                 ^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionGetter'.
 //     case Class_(: var extensionGetter): // Error: nullable extension member get
 //                 ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionMethod'.
 //     case Class_(: var extensionMethod): // Error: nullable extension tear-off
 //                 ^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the class 'void Function()?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the type 'void Function()?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'call'.
 //     case Function1_(: var call): // Error: nullable function tear-off
 //                     ^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '$1' isn't defined for the class '(int, {String named})?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '$1' isn't defined for the type '(int, {String named})?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$1'.
 //     case Record1_(: var $1): // Error: nullable record index get
 //                   ^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the class '(int, {String named})?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the type '(int, {String named})?'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
 //     case Record1_(: var named): // Error: nullable record named get
 //                   ^^^^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the class 'Class'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the type 'Class'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'ambiguousField'.
 //     case Class(: var ambiguousField): // Error: ambiguous get
@@ -88,24 +88,24 @@ library;
 //   if (cls case > 0) {} // Error: invalid instance >
 //                ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '<'.
 //   if (cls_ case < 0) {} // Error: nullable instance <
 //                 ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the class 'Class?'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the type 'Class?'.
 //  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named '<='.
 //   if (cls_ case <= 0) {} // Error: nullable extension <=
 //                 ^^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the class 'String'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '<'.
 //   if (string case < 0) {} // Error: missing <
 //                   ^
 //
-// pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the class 'String'.
+// pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the type 'String'.
 // Try correcting the name to the name of an existing method, or defining a method named '<='.
 //   if (string case <= 0) {} // Error: ambiguous <=
 //                   ^^
@@ -227,69 +227,69 @@ static method objectPattern(dynamic o) → dynamic {
       lowered core::int $1#case#1;
       lowered core::String named#case#1;
       invalid-type ambiguousField;
-      if(#0#0 is Null && (let final dynamic #t1 = hashCode = #0#0{Null}.{core::Object::hashCode}{<object>}.{core::int} in true) || #0#0 is Null && (let final dynamic #t2 = toString = #0#0{Null}.{core::Object::toString}{<object>}.{() → core::String} in true) || #0#0 is self::Class && (let final dynamic #t3 = field#case#0 = #0#5#isSet ?{dynamic} #0#5{dynamic} : let final dynamic #t4 = #0#5#isSet = true in #0#5 = #0#0{self::Class}.{self::Class::field}{dynamic} in true) || #0#0 is self::Class && (let final dynamic #t5 = method#case#0 = #0#6#isSet ?{() → void} #0#6{() → void} : let final dynamic #t6 = #0#6#isSet = true in #0#6 = #0#0{self::Class}.{self::Class::method}{() → void} in true) || #0#0 is self::Class && (let final dynamic #t7 = extensionGetter#case#0 = self::_extension#0|get#extensionGetter(#0#0{self::Class}) in true) || #0#0 is self::Class && (let final dynamic #t8 = extensionMethod#case#0 = self::_extension#0|get#extensionMethod(#0#0{self::Class}) in true) || #0#0 is dynamic && (let final dynamic #t9 = dynamicAccess = #0#0{dynamic}.dynamicAccess in true) || #0#0 is () → void && (let final dynamic #t10 = call#case#0 = #0#12#isSet ?{() → void} #0#12{() → void} : let final dynamic #t11 = #0#12#isSet = true in #0#12 = #0#0{() → void} in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t12 = $1#case#0 = #0#14#isSet ?{core::int} #0#14{core::int} : let final dynamic #t13 = #0#14#isSet = true in #0#14 = #0#0{(core::int, {required named: core::String})}.$1{core::int} in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t14 = named#case#0 = #0#15#isSet ?{core::String} #0#15{core::String} : let final dynamic #t15 = #0#15#isSet = true in #0#15 = #0#0{(core::int, {required named: core::String})}.named{core::String} in true) || #0#0 is self::Class && (let final dynamic #t16 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the class 'Class'.
+      if(#0#0 is Null && (let final dynamic #t1 = hashCode = #0#0{Null}.{core::Object::hashCode}{<object>}.{core::int} in true) || #0#0 is Null && (let final dynamic #t2 = toString = #0#0{Null}.{core::Object::toString}{<object>}.{() → core::String} in true) || #0#0 is self::Class && (let final dynamic #t3 = field#case#0 = #0#5#isSet ?{dynamic} #0#5{dynamic} : let final dynamic #t4 = #0#5#isSet = true in #0#5 = #0#0{self::Class}.{self::Class::field}{dynamic} in true) || #0#0 is self::Class && (let final dynamic #t5 = method#case#0 = #0#6#isSet ?{() → void} #0#6{() → void} : let final dynamic #t6 = #0#6#isSet = true in #0#6 = #0#0{self::Class}.{self::Class::method}{() → void} in true) || #0#0 is self::Class && (let final dynamic #t7 = extensionGetter#case#0 = self::_extension#0|get#extensionGetter(#0#0{self::Class}) in true) || #0#0 is self::Class && (let final dynamic #t8 = extensionMethod#case#0 = self::_extension#0|get#extensionMethod(#0#0{self::Class}) in true) || #0#0 is dynamic && (let final dynamic #t9 = dynamicAccess = #0#0{dynamic}.dynamicAccess in true) || #0#0 is () → void && (let final dynamic #t10 = call#case#0 = #0#12#isSet ?{() → void} #0#12{() → void} : let final dynamic #t11 = #0#12#isSet = true in #0#12 = #0#0{() → void} in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t12 = $1#case#0 = #0#14#isSet ?{core::int} #0#14{core::int} : let final dynamic #t13 = #0#14#isSet = true in #0#14 = #0#0{(core::int, {required named: core::String})}.$1{core::int} in true) || #0#0 is (core::int, {required named: core::String}) && (let final dynamic #t14 = named#case#0 = #0#15#isSet ?{core::String} #0#15{core::String} : let final dynamic #t15 = #0#15#isSet = true in #0#15 = #0#0{(core::int, {required named: core::String})}.named{core::String} in true) || #0#0 is self::Class && (let final dynamic #t16 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missing'.
     case Class(: var missing): // Error: missing getter
-               ^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the class 'Class'.
+               ^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:73:16: Error: The getter 'missing' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'missing'.
     case Class(: var missing): // Error: missing getter
-               ^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t17 = #0#5#isSet ?{invalid-type} #0#5{invalid-type} : let final dynamic #t18 = #0#5#isSet = true in #0#5 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the class 'Class?'.
+               ^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t17 = #0#5#isSet ?{invalid-type} #0#5{invalid-type} : let final dynamic #t18 = #0#5#isSet = true in #0#5 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
     case Class_(: var field): // Error: nullable member get
-                ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the class 'Class?'.
+                ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:74:17: Error: The getter 'field' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'field'.
     case Class_(: var field): // Error: nullable member get
-                ^^^^^") || #0#0 is self::Class? && (let final dynamic #t19 = #0#6#isSet ?{invalid-type} #0#6{invalid-type} : let final dynamic #t20 = #0#6#isSet = true in #0#6 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the class 'Class?'.
+                ^^^^^") || #0#0 is self::Class? && (let final dynamic #t19 = #0#6#isSet ?{invalid-type} #0#6{invalid-type} : let final dynamic #t20 = #0#6#isSet = true in #0#6 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'method'.
     case Class_(: var method): // Error: nullable member tear-off
-                ^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the class 'Class?'.
+                ^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:75:17: Error: The getter 'method' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'method'.
     case Class_(: var method): // Error: nullable member tear-off
-                ^^^^^^") || #0#0 is self::Class? && (let final dynamic #t21 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the class 'Class?'.
+                ^^^^^^") || #0#0 is self::Class? && (let final dynamic #t21 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionGetter'.
     case Class_(: var extensionGetter): // Error: nullable extension member get
-                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the class 'Class?'.
+                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:76:17: Error: The getter 'extensionGetter' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionGetter'.
     case Class_(: var extensionGetter): // Error: nullable extension member get
-                ^^^^^^^^^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t22 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the class 'Class?'.
+                ^^^^^^^^^^^^^^^") || #0#0 is self::Class? && (let final dynamic #t22 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionMethod'.
     case Class_(: var extensionMethod): // Error: nullable extension tear-off
-                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the class 'Class?'.
+                ^^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:77:17: Error: The getter 'extensionMethod' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'extensionMethod'.
     case Class_(: var extensionMethod): // Error: nullable extension tear-off
-                ^^^^^^^^^^^^^^^") || #0#0 is () →? void && (let final dynamic #t23 = #0#12#isSet ?{invalid-type} #0#12{invalid-type} : let final dynamic #t24 = #0#12#isSet = true in #0#12 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the class 'void Function()?'.
+                ^^^^^^^^^^^^^^^") || #0#0 is () →? void && (let final dynamic #t23 = #0#12#isSet ?{invalid-type} #0#12{invalid-type} : let final dynamic #t24 = #0#12#isSet = true in #0#12 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the type 'void Function()?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'call'.
     case Function1_(: var call): // Error: nullable function tear-off
-                    ^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the class 'void Function()?'.
+                    ^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:78:21: Error: The getter 'call' isn't defined for the type 'void Function()?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'call'.
     case Function1_(: var call): // Error: nullable function tear-off
-                    ^^^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t25 = #0#14#isSet ?{invalid-type} #0#14{invalid-type} : let final dynamic #t26 = #0#14#isSet = true in #0#14 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the class '(int, {String named})?'.
+                    ^^^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t25 = #0#14#isSet ?{invalid-type} #0#14{invalid-type} : let final dynamic #t26 = #0#14#isSet = true in #0#14 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$1'.
     case Record1_(: var \$1): // Error: nullable record index get
-                  ^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the class '(int, {String named})?'.
+                  ^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:79:19: Error: The getter '\$1' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$1'.
     case Record1_(: var \$1): // Error: nullable record index get
-                  ^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t27 = #0#15#isSet ?{invalid-type} #0#15{invalid-type} : let final dynamic #t28 = #0#15#isSet = true in #0#15 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the class '(int, {String named})?'.
+                  ^^") || #0#0 is (core::int, {required named: core::String})? && (let final dynamic #t27 = #0#15#isSet ?{invalid-type} #0#15{invalid-type} : let final dynamic #t28 = #0#15#isSet = true in #0#15 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
     case Record1_(: var named): // Error: nullable record named get
-                  ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the class '(int, {String named})?'.
+                  ^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:80:19: Error: The getter 'named' isn't defined for the type '(int, {String named})?'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'named'.
     case Record1_(: var named): // Error: nullable record named get
-                  ^^^^^") || #0#0 is self::Class && (let final dynamic #t29 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the class 'Class'.
+                  ^^^^^") || #0#0 is self::Class && (let final dynamic #t29 = invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'ambiguousField'.
     case Class(: var ambiguousField): // Error: ambiguous get
-               ^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the class 'Class'.
+               ^^^^^^^^^^^^^^" in invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:81:16: Error: The getter 'ambiguousField' isn't defined for the type 'Class'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'ambiguousField'.
     case Class(: var ambiguousField): // Error: ambiguous get
@@ -415,7 +415,7 @@ static method relationalPattern(dynamic dyn, Never never, self::Class cls, self:
   }
   {
     final synthesized self::Class? #22#0 = cls_;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the class 'Class?'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:119:17: Error: The method '<' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '<'.
   if (cls_ case < 0) {} // Error: nullable instance <
@@ -424,7 +424,7 @@ Try correcting the name to the name of an existing method, or defining a method
   }
   {
     final synthesized self::Class? #23#0 = cls_;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the class 'Class?'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:120:17: Error: The method '<=' isn't defined for the type 'Class?'.
  - 'Class' is from 'pkg/front_end/testcases/patterns/pattern_types.dart'.
 Try correcting the name to the name of an existing method, or defining a method named '<='.
   if (cls_ case <= 0) {} // Error: nullable extension <=
@@ -433,7 +433,7 @@ Try correcting the name to the name of an existing method, or defining a method
   }
   {
     final synthesized core::String #24#0 = string;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the class 'String'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:121:19: Error: The method '<' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '<'.
   if (string case < 0) {} // Error: missing <
                   ^") {
@@ -441,7 +441,7 @@ Try correcting the name to the name of an existing method, or defining a method
   }
   {
     final synthesized core::String #25#0 = string;
-    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the class 'String'.
+    if(invalid-expression "pkg/front_end/testcases/patterns/pattern_types.dart:122:19: Error: The method '<=' isn't defined for the type 'String'.
 Try correcting the name to the name of an existing method, or defining a method named '<='.
   if (string case <= 0) {} // Error: ambiguous <=
                   ^^") {
diff --git a/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.expect b/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.expect
index a890a0b026f..b8da80840d2 100644
--- a/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   c();
 //    ^
@@ -13,7 +13,7 @@ import "dart:core" as core;
 static const field core::int c = #C1;
 static method main() → dynamic {
   #C1;
-  invalid-expression "pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   c();
    ^" in #C1{<unresolved>}.call();
diff --git a/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.modular.expect b/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.modular.expect
index a890a0b026f..b8da80840d2 100644
--- a/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.modular.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   c();
 //    ^
@@ -13,7 +13,7 @@ import "dart:core" as core;
 static const field core::int c = #C1;
 static method main() → dynamic {
   #C1;
-  invalid-expression "pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   c();
    ^" in #C1{<unresolved>}.call();
diff --git a/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.transformed.expect
index a890a0b026f..b8da80840d2 100644
--- a/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/constant_get_and_invoke.dart.strong.transformed.expect
@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   c();
 //    ^
@@ -13,7 +13,7 @@ import "dart:core" as core;
 static const field core::int c = #C1;
 static method main() → dynamic {
   #C1;
-  invalid-expression "pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the class 'int'.
+  invalid-expression "pkg/front_end/testcases/rasta/constant_get_and_invoke.dart:8:4: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   c();
    ^" in #C1{<unresolved>}.call();
diff --git a/pkg/front_end/testcases/rasta/issue_000032.dart.strong.expect b/pkg/front_end/testcases/rasta/issue_000032.dart.strong.expect
index a29776adf8d..2be704bc41d 100644
--- a/pkg/front_end/testcases/rasta/issue_000032.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/issue_000032.dart.strong.expect
@@ -24,7 +24,7 @@ library;
 //   C<
 //    ^
 //
-// pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   C<
@@ -39,7 +39,7 @@ class C extends core::Object {
     ;
 }
 static method main() → dynamic {
-  invalid-expression "pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   C<
diff --git a/pkg/front_end/testcases/rasta/issue_000032.dart.strong.modular.expect b/pkg/front_end/testcases/rasta/issue_000032.dart.strong.modular.expect
index a29776adf8d..2be704bc41d 100644
--- a/pkg/front_end/testcases/rasta/issue_000032.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/rasta/issue_000032.dart.strong.modular.expect
@@ -24,7 +24,7 @@ library;
 //   C<
 //    ^
 //
-// pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   C<
@@ -39,7 +39,7 @@ class C extends core::Object {
     ;
 }
 static method main() → dynamic {
-  invalid-expression "pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   C<
diff --git a/pkg/front_end/testcases/rasta/issue_000032.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/issue_000032.dart.strong.transformed.expect
index a29776adf8d..2be704bc41d 100644
--- a/pkg/front_end/testcases/rasta/issue_000032.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000032.dart.strong.transformed.expect
@@ -24,7 +24,7 @@ library;
 //   C<
 //    ^
 //
-// pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the class 'Type'.
+// pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the type 'Type'.
 //  - 'Type' is from 'dart:core'.
 // Try correcting the operator to an existing operator, or defining a '<' operator.
 //   C<
@@ -39,7 +39,7 @@ class C extends core::Object {
     ;
 }
 static method main() → dynamic {
-  invalid-expression "pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the class 'Type'.
+  invalid-expression "pkg/front_end/testcases/rasta/issue_000032.dart:10:4: Error: The operator '<' isn't defined for the type 'Type'.
  - 'Type' is from 'dart:core'.
 Try correcting the operator to an existing operator, or defining a '<' operator.
   C<
diff --git a/pkg/front_end/testcases/rasta/issue_000044.dart.strong.expect b/pkg/front_end/testcases/rasta/issue_000044.dart.strong.expect
index 7c3146bab28..04bcb5998f4 100644
--- a/pkg/front_end/testcases/rasta/issue_000044.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/issue_000044.dart.strong.expect
@@ -44,7 +44,7 @@ library;
 //   C notEvenAConstructor(a) = h;
 //                            ^
 //
-// pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the class 'C'.
+// pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/rasta/issue_000044.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'h'.
 //   C notEvenAConstructor(a) = h;
@@ -71,7 +71,7 @@ Try removing the return type.
   static factory good() → self::C /* redirection-target: self::C::constant */
     return new self::C::constant();
   method notEvenAConstructor(dynamic a) → self::C
-    return invalid-expression "pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the class 'C'.
+    return invalid-expression "pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/rasta/issue_000044.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'h'.
   C notEvenAConstructor(a) = h;
diff --git a/pkg/front_end/testcases/rasta/issue_000044.dart.strong.modular.expect b/pkg/front_end/testcases/rasta/issue_000044.dart.strong.modular.expect
index 7c3146bab28..04bcb5998f4 100644
--- a/pkg/front_end/testcases/rasta/issue_000044.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/rasta/issue_000044.dart.strong.modular.expect
@@ -44,7 +44,7 @@ library;
 //   C notEvenAConstructor(a) = h;
 //                            ^
 //
-// pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the class 'C'.
+// pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/rasta/issue_000044.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'h'.
 //   C notEvenAConstructor(a) = h;
@@ -71,7 +71,7 @@ Try removing the return type.
   static factory good() → self::C /* redirection-target: self::C::constant */
     return new self::C::constant();
   method notEvenAConstructor(dynamic a) → self::C
-    return invalid-expression "pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the class 'C'.
+    return invalid-expression "pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/rasta/issue_000044.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'h'.
   C notEvenAConstructor(a) = h;
diff --git a/pkg/front_end/testcases/rasta/issue_000044.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/issue_000044.dart.strong.transformed.expect
index 040b653d210..0d6d6f83384 100644
--- a/pkg/front_end/testcases/rasta/issue_000044.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000044.dart.strong.transformed.expect
@@ -44,7 +44,7 @@ library;
 //   C notEvenAConstructor(a) = h;
 //                            ^
 //
-// pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the class 'C'.
+// pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/rasta/issue_000044.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'h'.
 //   C notEvenAConstructor(a) = h;
@@ -71,7 +71,7 @@ Try removing the return type.
   static factory good() → self::C /* redirection-target: self::C::constant */
     return new self::C::constant();
   method notEvenAConstructor(dynamic a) → self::C
-    return invalid-expression "pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the class 'C'.
+    return invalid-expression "pkg/front_end/testcases/rasta/issue_000044.dart:21:30: Error: The getter 'h' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/rasta/issue_000044.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'h'.
   C notEvenAConstructor(a) = h;
diff --git a/pkg/front_end/testcases/rasta/static.dart.strong.expect b/pkg/front_end/testcases/rasta/static.dart.strong.expect
index ef762a0679c..6698ba6d409 100644
--- a/pkg/front_end/testcases/rasta/static.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/static.dart.strong.expect
@@ -138,22 +138,22 @@ library;
 //     use(Foo.staticSetter ??= 87);
 //             ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     Foo.staticConstant();
 //                       ^
 //
-// pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     use(Foo.staticConstant());
 //                           ^
 //
-// pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     Foo.staticField();
 //                    ^
 //
-// pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     use(Foo.staticField());
 //                        ^
@@ -244,19 +244,19 @@ static method main() → dynamic {
     self::use(self::Foo::staticSetter = invalid-expression "pkg/front_end/testcases/rasta/static.dart:51:15: Error: Getter not found: 'staticSetter'.
     use(++Foo.staticSetter);
               ^^^^^^^^^^^^"{<invalid>}.+(1));
-    invalid-expression "pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     Foo.staticConstant();
                       ^" in #C1{<unresolved>}.call();
-    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the class 'int'.
+    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     use(Foo.staticConstant());
                           ^" in #C1{<unresolved>}.call());
-    invalid-expression "pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     Foo.staticField();
                    ^" in self::Foo::staticField{<unresolved>}.call();
-    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the class 'int'.
+    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     use(Foo.staticField());
                        ^" in self::Foo::staticField{<unresolved>}.call());
diff --git a/pkg/front_end/testcases/rasta/static.dart.strong.modular.expect b/pkg/front_end/testcases/rasta/static.dart.strong.modular.expect
index ef762a0679c..6698ba6d409 100644
--- a/pkg/front_end/testcases/rasta/static.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/rasta/static.dart.strong.modular.expect
@@ -138,22 +138,22 @@ library;
 //     use(Foo.staticSetter ??= 87);
 //             ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     Foo.staticConstant();
 //                       ^
 //
-// pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     use(Foo.staticConstant());
 //                           ^
 //
-// pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     Foo.staticField();
 //                    ^
 //
-// pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     use(Foo.staticField());
 //                        ^
@@ -244,19 +244,19 @@ static method main() → dynamic {
     self::use(self::Foo::staticSetter = invalid-expression "pkg/front_end/testcases/rasta/static.dart:51:15: Error: Getter not found: 'staticSetter'.
     use(++Foo.staticSetter);
               ^^^^^^^^^^^^"{<invalid>}.+(1));
-    invalid-expression "pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     Foo.staticConstant();
                       ^" in #C1{<unresolved>}.call();
-    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the class 'int'.
+    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     use(Foo.staticConstant());
                           ^" in #C1{<unresolved>}.call());
-    invalid-expression "pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     Foo.staticField();
                    ^" in self::Foo::staticField{<unresolved>}.call();
-    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the class 'int'.
+    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     use(Foo.staticField());
                        ^" in self::Foo::staticField{<unresolved>}.call());
diff --git a/pkg/front_end/testcases/rasta/static.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/static.dart.strong.transformed.expect
index ecef3f33843..a2d3dc4615c 100644
--- a/pkg/front_end/testcases/rasta/static.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/static.dart.strong.transformed.expect
@@ -138,22 +138,22 @@ library;
 //     use(Foo.staticSetter ??= 87);
 //             ^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     Foo.staticConstant();
 //                       ^
 //
-// pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     use(Foo.staticConstant());
 //                           ^
 //
-// pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     Foo.staticField();
 //                    ^
 //
-// pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the class 'int'.
+// pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //     use(Foo.staticField());
 //                        ^
@@ -244,19 +244,19 @@ static method main() → dynamic {
     self::use(self::Foo::staticSetter = invalid-expression "pkg/front_end/testcases/rasta/static.dart:51:15: Error: Getter not found: 'staticSetter'.
     use(++Foo.staticSetter);
               ^^^^^^^^^^^^"{<invalid>}.+(1));
-    invalid-expression "pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/rasta/static.dart:53:23: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     Foo.staticConstant();
                       ^" in #C1{<unresolved>}.call();
-    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the class 'int'.
+    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:54:27: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     use(Foo.staticConstant());
                           ^" in #C1{<unresolved>}.call());
-    invalid-expression "pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the class 'int'.
+    invalid-expression "pkg/front_end/testcases/rasta/static.dart:55:20: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     Foo.staticField();
                    ^" in self::Foo::staticField{<unresolved>}.call();
-    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the class 'int'.
+    self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:56:24: Error: The method 'call' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     use(Foo.staticField());
                        ^" in self::Foo::staticField{<unresolved>}.call());
diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.expect
index ac9f87461a3..37a65b85882 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.expect
@@ -27,19 +27,19 @@ library;
 //     for (1 in x) {
 //          ^
 //
-// pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the class 'Fisk'.
+// pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the type 'Fisk'.
 //  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'key'.
 //     for (key in x) {
 //          ^^^
 //
-// pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+// pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
 //  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
 //       print(key);
 //             ^^^
 //
-// pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+// pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
 //  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
 //       print(key);
@@ -94,16 +94,16 @@ class Fisk extends core::Object {
     ;
   method it1(dynamic x) → dynamic {
     for (final dynamic #t1 in x as{TypeError,ForDynamic} core::Iterable<dynamic>) {
-      invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the class 'Fisk'.
+      invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'key'.
     for (key in x) {
-         ^^^" in this.{<unresolved>}key = invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the class 'Fisk'.
+         ^^^" in this.{<unresolved>}key = invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'key'.
     for (key in x) {
          ^^^";
-      core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+      core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
       print(key);
@@ -138,7 +138,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     for (1 in x) {
          ^";
         1;
-        core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+        core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
       print(key);
diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.modular.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.modular.expect
index ac9f87461a3..37a65b85882 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.modular.expect
@@ -27,19 +27,19 @@ library;
 //     for (1 in x) {
 //          ^
 //
-// pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the class 'Fisk'.
+// pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the type 'Fisk'.
 //  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'key'.
 //     for (key in x) {
 //          ^^^
 //
-// pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+// pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
 //  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
 //       print(key);
 //             ^^^
 //
-// pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+// pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
 //  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
 //       print(key);
@@ -94,16 +94,16 @@ class Fisk extends core::Object {
     ;
   method it1(dynamic x) → dynamic {
     for (final dynamic #t1 in x as{TypeError,ForDynamic} core::Iterable<dynamic>) {
-      invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the class 'Fisk'.
+      invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'key'.
     for (key in x) {
-         ^^^" in this.{<unresolved>}key = invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the class 'Fisk'.
+         ^^^" in this.{<unresolved>}key = invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'key'.
     for (key in x) {
          ^^^";
-      core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+      core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
       print(key);
@@ -138,7 +138,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     for (1 in x) {
          ^";
         1;
-        core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+        core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
       print(key);
diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.transformed.expect
index e447f64a45e..2ebd260aece 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.transformed.expect
@@ -27,19 +27,19 @@ library;
 //     for (1 in x) {
 //          ^
 //
-// pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the class 'Fisk'.
+// pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the type 'Fisk'.
 //  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'key'.
 //     for (key in x) {
 //          ^^^
 //
-// pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+// pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
 //  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
 //       print(key);
 //             ^^^
 //
-// pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+// pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
 //  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
 //       print(key);
@@ -98,16 +98,16 @@ class Fisk extends core::Object {
       for (; :sync-for-iterator.{core::Iterator::moveNext}(){() → core::bool}; ) {
         final dynamic #t1 = :sync-for-iterator.{core::Iterator::current}{dynamic};
         {
-          invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the class 'Fisk'.
+          invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'key'.
     for (key in x) {
-         ^^^" in this.{<unresolved>}key = invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the class 'Fisk'.
+         ^^^" in this.{<unresolved>}key = invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:11:10: Error: The setter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'key'.
     for (key in x) {
          ^^^";
-          core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+          core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:12:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
       print(key);
@@ -166,7 +166,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     for (1 in x) {
          ^";
             1;
-            core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the class 'Fisk'.
+            core::print(invalid-expression "pkg/front_end/testcases/rasta/unresolved_for_in.dart:24:13: Error: The getter 'key' isn't defined for the type 'Fisk'.
  - 'Fisk' is from 'pkg/front_end/testcases/rasta/unresolved_for_in.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'key'.
       print(key);
diff --git a/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.expect b/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.expect
index 22fd9cc7859..e81cd17f030 100644
--- a/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.expect
+++ b/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.expect
@@ -2,72 +2,72 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 // method1c<T extends (int, String)>(T t) => t.$3; // Error
 //                                             ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 // method1d<T extends (int, String)>(T t) => t.a; // Error
 //                                             ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '$2' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '$2' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$2'.
 // method2c<T extends (int, {String a})>(T t) => t.$2; // Error
 //                                                 ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 // method2d<T extends (int, {String a})>(T t) => t.b; // Error
 //                                                 ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 // method3c<T extends (int, String), S extends T>(S t) => t.$3; // Error
 //                                                          ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 // method3d<T extends (int, String), S extends T>(S t) => t.a; // Error
 //                                                          ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 //   if (t is (int, String))  t.$3; // Error
 //                              ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 //   if (t is (int, String))  t.a; // Error
 //                              ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '$2' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '$2' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$2'.
 //   if (t is (int, {String a})) t.$2; // Error
 //                                 ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 //   if (t is (int, {String a})) t.b; // Error
 //                                 ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 //   if (t is (int, String))  t.$3; // Error
 //                              ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 //   if (t is (int, String))  t.a; // Error
 //                              ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '$2' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '$2' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$2'.
 //   if (t is (int, {String a})) t.$2; // Error
 //                                 ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 //   if (t is (int, {String a})) t.b; // Error
 //                                 ^
@@ -80,12 +80,12 @@ static method method1a<T extends (core::int, core::String)>(self::method1a::T t)
 static method method1b<T extends (core::int, core::String)>(self::method1b::T t) → dynamic
   return t.$2{core::String};
 static method method1c<T extends (core::int, core::String)>(self::method1c::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
 method1c<T extends (int, String)>(T t) => t.\$3; // Error
                                             ^^" in t{<unresolved>}.$3;
 static method method1d<T extends (core::int, core::String)>(self::method1d::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 method1d<T extends (int, String)>(T t) => t.a; // Error
                                             ^" in t{<unresolved>}.a;
@@ -94,12 +94,12 @@ static method method2a<T extends (core::int, {required a: core::String})>(self::
 static method method2b<T extends (core::int, {required a: core::String})>(self::method2b::T t) → dynamic
   return t.a{core::String};
 static method method2c<T extends (core::int, {required a: core::String})>(self::method2c::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '\$2' isn't defined for the class '(int, {String a})'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '\$2' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$2'.
 method2c<T extends (int, {String a})>(T t) => t.\$2; // Error
                                                 ^^" in t{<unresolved>}.$2;
 static method method2d<T extends (core::int, {required a: core::String})>(self::method2d::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 method2d<T extends (int, {String a})>(T t) => t.b; // Error
                                                 ^" in t{<unresolved>}.b;
@@ -108,12 +108,12 @@ static method method3a<T extends (core::int, core::String), S extends self::meth
 static method method3b<T extends (core::int, core::String), S extends self::method3b::T = (core::int, core::String)>(self::method3b::S t) → dynamic
   return t.$2{core::String};
 static method method3c<T extends (core::int, core::String), S extends self::method3c::T = (core::int, core::String)>(self::method3c::S t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
 method3c<T extends (int, String), S extends T>(S t) => t.\$3; // Error
                                                          ^^" in t{<unresolved>}.$3;
 static method method3d<T extends (core::int, core::String), S extends self::method3d::T = (core::int, core::String)>(self::method3d::S t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 method3d<T extends (int, String), S extends T>(S t) => t.a; // Error
                                                          ^" in t{<unresolved>}.a;
@@ -123,12 +123,12 @@ static method method1<T extends core::Object? = dynamic>(self::method1::T% t) 
   if(t is (core::int, core::String))
     t{self::method1::T% & (core::int, core::String) /* '%' & '!' = '!' */}.$2{core::String};
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
   if (t is (int, String))  t.\$3; // Error
                              ^^" in t{self::method1::T% & (core::int, core::String) /* '%' & '!' = '!' */}{<unresolved>}.$3;
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
   if (t is (int, String))  t.a; // Error
                              ^" in t{self::method1::T% & (core::int, core::String) /* '%' & '!' = '!' */}{<unresolved>}.a;
@@ -137,12 +137,12 @@ Try correcting the name to the name of an existing getter, or defining a getter
   if(t is (core::int, {required a: core::String}))
     t{self::method1::T% & (core::int, {required a: core::String}) /* '%' & '!' = '!' */}.a{core::String};
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '\$2' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '\$2' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$2'.
   if (t is (int, {String a})) t.\$2; // Error
                                 ^^" in t{self::method1::T% & (core::int, {required a: core::String}) /* '%' & '!' = '!' */}{<unresolved>}.$2;
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
   if (t is (int, {String a})) t.b; // Error
                                 ^" in t{self::method1::T% & (core::int, {required a: core::String}) /* '%' & '!' = '!' */}{<unresolved>}.b;
@@ -153,12 +153,12 @@ static method method2(core::Object t) → void {
   if(t is (core::int, core::String))
     t{(core::int, core::String)}.$2{core::String};
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
   if (t is (int, String))  t.\$3; // Error
                              ^^" in t{(core::int, core::String)}{<unresolved>}.$3;
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
   if (t is (int, String))  t.a; // Error
                              ^" in t{(core::int, core::String)}{<unresolved>}.a;
@@ -167,12 +167,12 @@ Try correcting the name to the name of an existing getter, or defining a getter
   if(t is (core::int, {required a: core::String}))
     t{(core::int, {required a: core::String})}.a{core::String};
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '\$2' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '\$2' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$2'.
   if (t is (int, {String a})) t.\$2; // Error
                                 ^^" in t{(core::int, {required a: core::String})}{<unresolved>}.$2;
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
   if (t is (int, {String a})) t.b; // Error
                                 ^" in t{(core::int, {required a: core::String})}{<unresolved>}.b;
diff --git a/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.modular.expect b/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.modular.expect
index 22fd9cc7859..e81cd17f030 100644
--- a/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.modular.expect
@@ -2,72 +2,72 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 // method1c<T extends (int, String)>(T t) => t.$3; // Error
 //                                             ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 // method1d<T extends (int, String)>(T t) => t.a; // Error
 //                                             ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '$2' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '$2' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$2'.
 // method2c<T extends (int, {String a})>(T t) => t.$2; // Error
 //                                                 ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 // method2d<T extends (int, {String a})>(T t) => t.b; // Error
 //                                                 ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 // method3c<T extends (int, String), S extends T>(S t) => t.$3; // Error
 //                                                          ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 // method3d<T extends (int, String), S extends T>(S t) => t.a; // Error
 //                                                          ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 //   if (t is (int, String))  t.$3; // Error
 //                              ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 //   if (t is (int, String))  t.a; // Error
 //                              ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '$2' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '$2' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$2'.
 //   if (t is (int, {String a})) t.$2; // Error
 //                                 ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 //   if (t is (int, {String a})) t.b; // Error
 //                                 ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 //   if (t is (int, String))  t.$3; // Error
 //                              ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 //   if (t is (int, String))  t.a; // Error
 //                              ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '$2' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '$2' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$2'.
 //   if (t is (int, {String a})) t.$2; // Error
 //                                 ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 //   if (t is (int, {String a})) t.b; // Error
 //                                 ^
@@ -80,12 +80,12 @@ static method method1a<T extends (core::int, core::String)>(self::method1a::T t)
 static method method1b<T extends (core::int, core::String)>(self::method1b::T t) → dynamic
   return t.$2{core::String};
 static method method1c<T extends (core::int, core::String)>(self::method1c::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
 method1c<T extends (int, String)>(T t) => t.\$3; // Error
                                             ^^" in t{<unresolved>}.$3;
 static method method1d<T extends (core::int, core::String)>(self::method1d::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 method1d<T extends (int, String)>(T t) => t.a; // Error
                                             ^" in t{<unresolved>}.a;
@@ -94,12 +94,12 @@ static method method2a<T extends (core::int, {required a: core::String})>(self::
 static method method2b<T extends (core::int, {required a: core::String})>(self::method2b::T t) → dynamic
   return t.a{core::String};
 static method method2c<T extends (core::int, {required a: core::String})>(self::method2c::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '\$2' isn't defined for the class '(int, {String a})'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '\$2' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$2'.
 method2c<T extends (int, {String a})>(T t) => t.\$2; // Error
                                                 ^^" in t{<unresolved>}.$2;
 static method method2d<T extends (core::int, {required a: core::String})>(self::method2d::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 method2d<T extends (int, {String a})>(T t) => t.b; // Error
                                                 ^" in t{<unresolved>}.b;
@@ -108,12 +108,12 @@ static method method3a<T extends (core::int, core::String), S extends self::meth
 static method method3b<T extends (core::int, core::String), S extends self::method3b::T = (core::int, core::String)>(self::method3b::S t) → dynamic
   return t.$2{core::String};
 static method method3c<T extends (core::int, core::String), S extends self::method3c::T = (core::int, core::String)>(self::method3c::S t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
 method3c<T extends (int, String), S extends T>(S t) => t.\$3; // Error
                                                          ^^" in t{<unresolved>}.$3;
 static method method3d<T extends (core::int, core::String), S extends self::method3d::T = (core::int, core::String)>(self::method3d::S t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 method3d<T extends (int, String), S extends T>(S t) => t.a; // Error
                                                          ^" in t{<unresolved>}.a;
@@ -123,12 +123,12 @@ static method method1<T extends core::Object? = dynamic>(self::method1::T% t) 
   if(t is (core::int, core::String))
     t{self::method1::T% & (core::int, core::String) /* '%' & '!' = '!' */}.$2{core::String};
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
   if (t is (int, String))  t.\$3; // Error
                              ^^" in t{self::method1::T% & (core::int, core::String) /* '%' & '!' = '!' */}{<unresolved>}.$3;
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
   if (t is (int, String))  t.a; // Error
                              ^" in t{self::method1::T% & (core::int, core::String) /* '%' & '!' = '!' */}{<unresolved>}.a;
@@ -137,12 +137,12 @@ Try correcting the name to the name of an existing getter, or defining a getter
   if(t is (core::int, {required a: core::String}))
     t{self::method1::T% & (core::int, {required a: core::String}) /* '%' & '!' = '!' */}.a{core::String};
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '\$2' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '\$2' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$2'.
   if (t is (int, {String a})) t.\$2; // Error
                                 ^^" in t{self::method1::T% & (core::int, {required a: core::String}) /* '%' & '!' = '!' */}{<unresolved>}.$2;
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
   if (t is (int, {String a})) t.b; // Error
                                 ^" in t{self::method1::T% & (core::int, {required a: core::String}) /* '%' & '!' = '!' */}{<unresolved>}.b;
@@ -153,12 +153,12 @@ static method method2(core::Object t) → void {
   if(t is (core::int, core::String))
     t{(core::int, core::String)}.$2{core::String};
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
   if (t is (int, String))  t.\$3; // Error
                              ^^" in t{(core::int, core::String)}{<unresolved>}.$3;
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
   if (t is (int, String))  t.a; // Error
                              ^" in t{(core::int, core::String)}{<unresolved>}.a;
@@ -167,12 +167,12 @@ Try correcting the name to the name of an existing getter, or defining a getter
   if(t is (core::int, {required a: core::String}))
     t{(core::int, {required a: core::String})}.a{core::String};
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '\$2' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '\$2' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$2'.
   if (t is (int, {String a})) t.\$2; // Error
                                 ^^" in t{(core::int, {required a: core::String})}{<unresolved>}.$2;
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
   if (t is (int, {String a})) t.b; // Error
                                 ^" in t{(core::int, {required a: core::String})}{<unresolved>}.b;
diff --git a/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.transformed.expect b/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.transformed.expect
index 22fd9cc7859..e81cd17f030 100644
--- a/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/records/access_through_type_variable.dart.strong.transformed.expect
@@ -2,72 +2,72 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 // method1c<T extends (int, String)>(T t) => t.$3; // Error
 //                                             ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 // method1d<T extends (int, String)>(T t) => t.a; // Error
 //                                             ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '$2' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '$2' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$2'.
 // method2c<T extends (int, {String a})>(T t) => t.$2; // Error
 //                                                 ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 // method2d<T extends (int, {String a})>(T t) => t.b; // Error
 //                                                 ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 // method3c<T extends (int, String), S extends T>(S t) => t.$3; // Error
 //                                                          ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 // method3d<T extends (int, String), S extends T>(S t) => t.a; // Error
 //                                                          ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 //   if (t is (int, String))  t.$3; // Error
 //                              ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 //   if (t is (int, String))  t.a; // Error
 //                              ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '$2' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '$2' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$2'.
 //   if (t is (int, {String a})) t.$2; // Error
 //                                 ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 //   if (t is (int, {String a})) t.b; // Error
 //                                 ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 //   if (t is (int, String))  t.$3; // Error
 //                              ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 //   if (t is (int, String))  t.a; // Error
 //                              ^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '$2' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '$2' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$2'.
 //   if (t is (int, {String a})) t.$2; // Error
 //                                 ^^
 //
-// pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+// pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 //   if (t is (int, {String a})) t.b; // Error
 //                                 ^
@@ -80,12 +80,12 @@ static method method1a<T extends (core::int, core::String)>(self::method1a::T t)
 static method method1b<T extends (core::int, core::String)>(self::method1b::T t) → dynamic
   return t.$2{core::String};
 static method method1c<T extends (core::int, core::String)>(self::method1c::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:7:45: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
 method1c<T extends (int, String)>(T t) => t.\$3; // Error
                                             ^^" in t{<unresolved>}.$3;
 static method method1d<T extends (core::int, core::String)>(self::method1d::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:8:45: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 method1d<T extends (int, String)>(T t) => t.a; // Error
                                             ^" in t{<unresolved>}.a;
@@ -94,12 +94,12 @@ static method method2a<T extends (core::int, {required a: core::String})>(self::
 static method method2b<T extends (core::int, {required a: core::String})>(self::method2b::T t) → dynamic
   return t.a{core::String};
 static method method2c<T extends (core::int, {required a: core::String})>(self::method2c::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '\$2' isn't defined for the class '(int, {String a})'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:12:49: Error: The getter '\$2' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$2'.
 method2c<T extends (int, {String a})>(T t) => t.\$2; // Error
                                                 ^^" in t{<unresolved>}.$2;
 static method method2d<T extends (core::int, {required a: core::String})>(self::method2d::T t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:13:49: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
 method2d<T extends (int, {String a})>(T t) => t.b; // Error
                                                 ^" in t{<unresolved>}.b;
@@ -108,12 +108,12 @@ static method method3a<T extends (core::int, core::String), S extends self::meth
 static method method3b<T extends (core::int, core::String), S extends self::method3b::T = (core::int, core::String)>(self::method3b::S t) → dynamic
   return t.$2{core::String};
 static method method3c<T extends (core::int, core::String), S extends self::method3c::T = (core::int, core::String)>(self::method3c::S t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:17:58: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
 method3c<T extends (int, String), S extends T>(S t) => t.\$3; // Error
                                                          ^^" in t{<unresolved>}.$3;
 static method method3d<T extends (core::int, core::String), S extends self::method3d::T = (core::int, core::String)>(self::method3d::S t) → dynamic
-  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the class '(int, String)'.
+  return invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:18:58: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
 method3d<T extends (int, String), S extends T>(S t) => t.a; // Error
                                                          ^" in t{<unresolved>}.a;
@@ -123,12 +123,12 @@ static method method1<T extends core::Object? = dynamic>(self::method1::T% t) 
   if(t is (core::int, core::String))
     t{self::method1::T% & (core::int, core::String) /* '%' & '!' = '!' */}.$2{core::String};
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:23:30: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
   if (t is (int, String))  t.\$3; // Error
                              ^^" in t{self::method1::T% & (core::int, core::String) /* '%' & '!' = '!' */}{<unresolved>}.$3;
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:24:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
   if (t is (int, String))  t.a; // Error
                              ^" in t{self::method1::T% & (core::int, core::String) /* '%' & '!' = '!' */}{<unresolved>}.a;
@@ -137,12 +137,12 @@ Try correcting the name to the name of an existing getter, or defining a getter
   if(t is (core::int, {required a: core::String}))
     t{self::method1::T% & (core::int, {required a: core::String}) /* '%' & '!' = '!' */}.a{core::String};
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '\$2' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:28:33: Error: The getter '\$2' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$2'.
   if (t is (int, {String a})) t.\$2; // Error
                                 ^^" in t{self::method1::T% & (core::int, {required a: core::String}) /* '%' & '!' = '!' */}{<unresolved>}.$2;
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:29:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
   if (t is (int, {String a})) t.b; // Error
                                 ^" in t{self::method1::T% & (core::int, {required a: core::String}) /* '%' & '!' = '!' */}{<unresolved>}.b;
@@ -153,12 +153,12 @@ static method method2(core::Object t) → void {
   if(t is (core::int, core::String))
     t{(core::int, core::String)}.$2{core::String};
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:35:30: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
   if (t is (int, String))  t.\$3; // Error
                              ^^" in t{(core::int, core::String)}{<unresolved>}.$3;
   if(t is (core::int, core::String))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the class '(int, String)'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:36:30: Error: The getter 'a' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'a'.
   if (t is (int, String))  t.a; // Error
                              ^" in t{(core::int, core::String)}{<unresolved>}.a;
@@ -167,12 +167,12 @@ Try correcting the name to the name of an existing getter, or defining a getter
   if(t is (core::int, {required a: core::String}))
     t{(core::int, {required a: core::String})}.a{core::String};
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '\$2' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:40:33: Error: The getter '\$2' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$2'.
   if (t is (int, {String a})) t.\$2; // Error
                                 ^^" in t{(core::int, {required a: core::String})}{<unresolved>}.$2;
   if(t is (core::int, {required a: core::String}))
-    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the class '(int, {String a})'.
+    invalid-expression "pkg/front_end/testcases/records/access_through_type_variable.dart:41:33: Error: The getter 'b' isn't defined for the type '(int, {String a})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
   if (t is (int, {String a})) t.b; // Error
                                 ^" in t{(core::int, {required a: core::String})}{<unresolved>}.b;
diff --git a/pkg/front_end/testcases/records/issue50157.dart.strong.expect b/pkg/front_end/testcases/records/issue50157.dart.strong.expect
index dc78132afd4..b417943e7b2 100644
--- a/pkg/front_end/testcases/records/issue50157.dart.strong.expect
+++ b/pkg/front_end/testcases/records/issue50157.dart.strong.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the class 'A'.
+// pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the type 'A'.
 //  - 'A' is from 'pkg/front_end/testcases/records/issue50157.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
 //   a.foo = 1; // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the class '({int foo})'.
+// pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the type '({int foo})'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
 //   r.foo = 2; // Error.
 //     ^^^
@@ -34,13 +34,13 @@ static extension-member method _extension#0|set#foo(lowered final self::A #this,
 static extension-member method _extension#1|set#foo(lowered final({required foo: core::int}) #this, core::int value) → void {}
 static method test(self::A a, ({required foo: core::int}) r) → dynamic {
   a.{self::A::foo}{core::int};
-  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the type 'A'.
  - 'A' is from 'pkg/front_end/testcases/records/issue50157.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
   a.foo = 1; // Error.
     ^^^" in a.{<unresolved>}foo = 1;
   r.foo{core::int};
-  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the class '({int foo})'.
+  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the type '({int foo})'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
   r.foo = 2; // Error.
     ^^^" in r.{<unresolved>}foo = 2;
diff --git a/pkg/front_end/testcases/records/issue50157.dart.strong.modular.expect b/pkg/front_end/testcases/records/issue50157.dart.strong.modular.expect
index dc78132afd4..b417943e7b2 100644
--- a/pkg/front_end/testcases/records/issue50157.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/records/issue50157.dart.strong.modular.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the class 'A'.
+// pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the type 'A'.
 //  - 'A' is from 'pkg/front_end/testcases/records/issue50157.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
 //   a.foo = 1; // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the class '({int foo})'.
+// pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the type '({int foo})'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
 //   r.foo = 2; // Error.
 //     ^^^
@@ -34,13 +34,13 @@ static extension-member method _extension#0|set#foo(lowered final self::A #this,
 static extension-member method _extension#1|set#foo(lowered final({required foo: core::int}) #this, core::int value) → void {}
 static method test(self::A a, ({required foo: core::int}) r) → dynamic {
   a.{self::A::foo}{core::int};
-  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the type 'A'.
  - 'A' is from 'pkg/front_end/testcases/records/issue50157.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
   a.foo = 1; // Error.
     ^^^" in a.{<unresolved>}foo = 1;
   r.foo{core::int};
-  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the class '({int foo})'.
+  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the type '({int foo})'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
   r.foo = 2; // Error.
     ^^^" in r.{<unresolved>}foo = 2;
diff --git a/pkg/front_end/testcases/records/issue50157.dart.strong.transformed.expect b/pkg/front_end/testcases/records/issue50157.dart.strong.transformed.expect
index dc78132afd4..b417943e7b2 100644
--- a/pkg/front_end/testcases/records/issue50157.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/records/issue50157.dart.strong.transformed.expect
@@ -2,13 +2,13 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the class 'A'.
+// pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the type 'A'.
 //  - 'A' is from 'pkg/front_end/testcases/records/issue50157.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
 //   a.foo = 1; // Error.
 //     ^^^
 //
-// pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the class '({int foo})'.
+// pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the type '({int foo})'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
 //   r.foo = 2; // Error.
 //     ^^^
@@ -34,13 +34,13 @@ static extension-member method _extension#0|set#foo(lowered final self::A #this,
 static extension-member method _extension#1|set#foo(lowered final({required foo: core::int}) #this, core::int value) → void {}
 static method test(self::A a, ({required foo: core::int}) r) → dynamic {
   a.{self::A::foo}{core::int};
-  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the class 'A'.
+  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:21:5: Error: The setter 'foo' isn't defined for the type 'A'.
  - 'A' is from 'pkg/front_end/testcases/records/issue50157.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
   a.foo = 1; // Error.
     ^^^" in a.{<unresolved>}foo = 1;
   r.foo{core::int};
-  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the class '({int foo})'.
+  invalid-expression "pkg/front_end/testcases/records/issue50157.dart:23:5: Error: The setter 'foo' isn't defined for the type '({int foo})'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'foo'.
   r.foo = 2; // Error.
     ^^^" in r.{<unresolved>}foo = 2;
diff --git a/pkg/front_end/testcases/records/issue50513.dart.strong.expect b/pkg/front_end/testcases/records/issue50513.dart.strong.expect
index 89288795ffb..bf66e54776e 100644
--- a/pkg/front_end/testcases/records/issue50513.dart.strong.expect
+++ b/pkg/front_end/testcases/records/issue50513.dart.strong.expect
@@ -2,22 +2,22 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '$00' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '$00' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$00'.
 //   print(r.$00); // Error.
 //           ^^^
 //
-// pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '$0x0' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '$0x0' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$0x0'.
 //   print(r.$0x0); // Error.
 //           ^^^^
 //
-// pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '$01' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '$01' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$01'.
 //   print(r.$01); // Error.
 //           ^^^
 //
-// pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '$0x1' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '$0x1' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$0x1'.
 //   print(r.$0x1); // Error.
 //           ^^^^
@@ -27,19 +27,19 @@ import "dart:core" as core;
 
 static method test() → dynamic {
   (core::int, core::String) r = (0, "one");
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '\$00' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '\$00' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$00'.
   print(r.\$00); // Error.
           ^^^" in r{<unresolved>}.$00);
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '\$0x0' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '\$0x0' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$0x0'.
   print(r.\$0x0); // Error.
           ^^^^" in r{<unresolved>}.$0x0);
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '\$01' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '\$01' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$01'.
   print(r.\$01); // Error.
           ^^^" in r{<unresolved>}.$01);
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '\$0x1' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '\$0x1' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$0x1'.
   print(r.\$0x1); // Error.
           ^^^^" in r{<unresolved>}.$0x1);
diff --git a/pkg/front_end/testcases/records/issue50513.dart.strong.modular.expect b/pkg/front_end/testcases/records/issue50513.dart.strong.modular.expect
index 89288795ffb..bf66e54776e 100644
--- a/pkg/front_end/testcases/records/issue50513.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/records/issue50513.dart.strong.modular.expect
@@ -2,22 +2,22 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '$00' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '$00' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$00'.
 //   print(r.$00); // Error.
 //           ^^^
 //
-// pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '$0x0' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '$0x0' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$0x0'.
 //   print(r.$0x0); // Error.
 //           ^^^^
 //
-// pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '$01' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '$01' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$01'.
 //   print(r.$01); // Error.
 //           ^^^
 //
-// pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '$0x1' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '$0x1' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$0x1'.
 //   print(r.$0x1); // Error.
 //           ^^^^
@@ -27,19 +27,19 @@ import "dart:core" as core;
 
 static method test() → dynamic {
   (core::int, core::String) r = (0, "one");
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '\$00' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '\$00' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$00'.
   print(r.\$00); // Error.
           ^^^" in r{<unresolved>}.$00);
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '\$0x0' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '\$0x0' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$0x0'.
   print(r.\$0x0); // Error.
           ^^^^" in r{<unresolved>}.$0x0);
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '\$01' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '\$01' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$01'.
   print(r.\$01); // Error.
           ^^^" in r{<unresolved>}.$01);
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '\$0x1' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '\$0x1' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$0x1'.
   print(r.\$0x1); // Error.
           ^^^^" in r{<unresolved>}.$0x1);
diff --git a/pkg/front_end/testcases/records/issue50513.dart.strong.transformed.expect b/pkg/front_end/testcases/records/issue50513.dart.strong.transformed.expect
index 44d5f859be8..8402c43145c 100644
--- a/pkg/front_end/testcases/records/issue50513.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/records/issue50513.dart.strong.transformed.expect
@@ -2,22 +2,22 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '$00' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '$00' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$00'.
 //   print(r.$00); // Error.
 //           ^^^
 //
-// pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '$0x0' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '$0x0' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$0x0'.
 //   print(r.$0x0); // Error.
 //           ^^^^
 //
-// pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '$01' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '$01' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$01'.
 //   print(r.$01); // Error.
 //           ^^^
 //
-// pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '$0x1' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '$0x1' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$0x1'.
 //   print(r.$0x1); // Error.
 //           ^^^^
@@ -27,19 +27,19 @@ import "dart:core" as core;
 
 static method test() → dynamic {
   (core::int, core::String) r = (0, "one");
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '\$00' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:7:11: Error: The getter '\$00' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$00'.
   print(r.\$00); // Error.
           ^^^" in r{<unresolved>}.$00);
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '\$0x0' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:8:11: Error: The getter '\$0x0' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$0x0'.
   print(r.\$0x0); // Error.
           ^^^^" in r{<unresolved>}.$0x0);
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '\$01' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:9:11: Error: The getter '\$01' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$01'.
   print(r.\$01); // Error.
           ^^^" in r{<unresolved>}.$01);
-  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '\$0x1' isn't defined for the class '(int, String)'.
+  core::print(invalid-expression "pkg/front_end/testcases/records/issue50513.dart:10:11: Error: The getter '\$0x1' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$0x1'.
   print(r.\$0x1); // Error.
           ^^^^" in r{<unresolved>}.$0x1);
diff --git a/pkg/front_end/testcases/records/issue54616_2.dart.strong.expect b/pkg/front_end/testcases/records/issue54616_2.dart.strong.expect
index 653cee2bb1c..23201212896 100644
--- a/pkg/front_end/testcases/records/issue54616_2.dart.strong.expect
+++ b/pkg/front_end/testcases/records/issue54616_2.dart.strong.expect
@@ -10,12 +10,12 @@ library;
 //   r3(0); // Error.
 //   ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   r4(0); // Error.
 //     ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   r4.call(0); // Error.
 //      ^^^^
@@ -28,7 +28,7 @@ library;
 //   x3(0); // Error.
 //   ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4(0); // Error.
 //     ^
@@ -48,12 +48,12 @@ library;
 //   x3n(0); // Error.
 //      ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the class '(String)?'.
+// pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the type '(String)?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4n(0); // Error.
 //      ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4.call(0); // Error.
 //      ^^^^
@@ -73,7 +73,7 @@ library;
 //   x3n.call(0); // Error.
 //       ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the class '(String)?'.
+// pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the type '(String)?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4n.call(0); // Error.
 //       ^^^^
@@ -101,21 +101,21 @@ static method test<X1 extends (core::int), X2 extends (core::int, {required call
   self::EInt|call(r1, 0);
   r2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   r3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   r4(0); // Error.
     ^" in r4{<unresolved>}.call(0);
   self::EInt|call(r1, 0);
   r2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   r3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   r4.call(0); // Error.
      ^^^^" in r4{<unresolved>}.call(0);
   self::EInt|call(x1, 0);
   x2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   x3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4(0); // Error.
     ^" in x4{<unresolved>}.call(0);
@@ -131,14 +131,14 @@ Try calling using ?.call instead.
 Try calling using ?.call instead.
   x3n(0); // Error.
      ^" in x3n.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the class '(String)?'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the type '(String)?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4n(0); // Error.
      ^" in x4n{<unresolved>}.call(0);
   self::EInt|call(x1, 0);
   x2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   x3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4.call(0); // Error.
      ^^^^" in x4{<unresolved>}.call(0);
@@ -154,7 +154,7 @@ Try calling using ?.call instead.
 Try calling using ?.call instead.
   x3n.call(0); // Error.
       ^" in x3n.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the class '(String)?'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the type '(String)?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4n.call(0); // Error.
       ^^^^" in x4n{<unresolved>}.call(0);
diff --git a/pkg/front_end/testcases/records/issue54616_2.dart.strong.modular.expect b/pkg/front_end/testcases/records/issue54616_2.dart.strong.modular.expect
index 653cee2bb1c..23201212896 100644
--- a/pkg/front_end/testcases/records/issue54616_2.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/records/issue54616_2.dart.strong.modular.expect
@@ -10,12 +10,12 @@ library;
 //   r3(0); // Error.
 //   ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   r4(0); // Error.
 //     ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   r4.call(0); // Error.
 //      ^^^^
@@ -28,7 +28,7 @@ library;
 //   x3(0); // Error.
 //   ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4(0); // Error.
 //     ^
@@ -48,12 +48,12 @@ library;
 //   x3n(0); // Error.
 //      ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the class '(String)?'.
+// pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the type '(String)?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4n(0); // Error.
 //      ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4.call(0); // Error.
 //      ^^^^
@@ -73,7 +73,7 @@ library;
 //   x3n.call(0); // Error.
 //       ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the class '(String)?'.
+// pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the type '(String)?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4n.call(0); // Error.
 //       ^^^^
@@ -101,21 +101,21 @@ static method test<X1 extends (core::int), X2 extends (core::int, {required call
   self::EInt|call(r1, 0);
   r2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   r3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   r4(0); // Error.
     ^" in r4{<unresolved>}.call(0);
   self::EInt|call(r1, 0);
   r2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   r3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   r4.call(0); // Error.
      ^^^^" in r4{<unresolved>}.call(0);
   self::EInt|call(x1, 0);
   x2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   x3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4(0); // Error.
     ^" in x4{<unresolved>}.call(0);
@@ -131,14 +131,14 @@ Try calling using ?.call instead.
 Try calling using ?.call instead.
   x3n(0); // Error.
      ^" in x3n.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the class '(String)?'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the type '(String)?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4n(0); // Error.
      ^" in x4n{<unresolved>}.call(0);
   self::EInt|call(x1, 0);
   x2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   x3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4.call(0); // Error.
      ^^^^" in x4{<unresolved>}.call(0);
@@ -154,7 +154,7 @@ Try calling using ?.call instead.
 Try calling using ?.call instead.
   x3n.call(0); // Error.
       ^" in x3n.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the class '(String)?'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the type '(String)?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4n.call(0); // Error.
       ^^^^" in x4n{<unresolved>}.call(0);
diff --git a/pkg/front_end/testcases/records/issue54616_2.dart.strong.transformed.expect b/pkg/front_end/testcases/records/issue54616_2.dart.strong.transformed.expect
index 653cee2bb1c..23201212896 100644
--- a/pkg/front_end/testcases/records/issue54616_2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/records/issue54616_2.dart.strong.transformed.expect
@@ -10,12 +10,12 @@ library;
 //   r3(0); // Error.
 //   ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   r4(0); // Error.
 //     ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   r4.call(0); // Error.
 //      ^^^^
@@ -28,7 +28,7 @@ library;
 //   x3(0); // Error.
 //   ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4(0); // Error.
 //     ^
@@ -48,12 +48,12 @@ library;
 //   x3n(0); // Error.
 //      ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the class '(String)?'.
+// pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the type '(String)?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4n(0); // Error.
 //      ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the class '(String)'.
+// pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the type '(String)'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4.call(0); // Error.
 //      ^^^^
@@ -73,7 +73,7 @@ library;
 //   x3n.call(0); // Error.
 //       ^
 //
-// pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the class '(String)?'.
+// pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the type '(String)?'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   x4n.call(0); // Error.
 //       ^^^^
@@ -101,21 +101,21 @@ static method test<X1 extends (core::int), X2 extends (core::int, {required call
   self::EInt|call(r1, 0);
   r2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   r3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:29:5: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   r4(0); // Error.
     ^" in r4{<unresolved>}.call(0);
   self::EInt|call(r1, 0);
   r2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   r3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:33:6: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   r4.call(0); // Error.
      ^^^^" in r4{<unresolved>}.call(0);
   self::EInt|call(x1, 0);
   x2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   x3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:38:5: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4(0); // Error.
     ^" in x4{<unresolved>}.call(0);
@@ -131,14 +131,14 @@ Try calling using ?.call instead.
 Try calling using ?.call instead.
   x3n(0); // Error.
      ^" in x3n.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the class '(String)?'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:42:6: Error: The method 'call' isn't defined for the type '(String)?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4n(0); // Error.
      ^" in x4n{<unresolved>}.call(0);
   self::EInt|call(x1, 0);
   x2.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
   x3.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the class '(String)'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:47:6: Error: The method 'call' isn't defined for the type '(String)'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4.call(0); // Error.
      ^^^^" in x4{<unresolved>}.call(0);
@@ -154,7 +154,7 @@ Try calling using ?.call instead.
 Try calling using ?.call instead.
   x3n.call(0); // Error.
       ^" in x3n.call{(dynamic) → dynamic}(0){(dynamic) → dynamic};
-  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the class '(String)?'.
+  invalid-expression "pkg/front_end/testcases/records/issue54616_2.dart:51:7: Error: The method 'call' isn't defined for the type '(String)?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   x4n.call(0); // Error.
       ^^^^" in x4n{<unresolved>}.call(0);
diff --git a/pkg/front_end/testcases/records/record_get_errors.dart.strong.expect b/pkg/front_end/testcases/records/record_get_errors.dart.strong.expect
index c9639b1b2a2..c7429ddcf98 100644
--- a/pkg/front_end/testcases/records/record_get_errors.dart.strong.expect
+++ b/pkg/front_end/testcases/records/record_get_errors.dart.strong.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 //   (0, "").$3;
 //           ^^
 //
-// pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the class '(int, {String a, bool b})'.
+// pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the type '(int, {String a, bool b})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
 //   (0, a: "", b: true).c;
 //                       ^
@@ -16,11 +16,11 @@ import self as self;
 import "dart:core" as core;
 
 static method method() → dynamic {
-  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
   (0, \"\").\$3;
           ^^" in (0, ""){<unresolved>}.$3;
-  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the class '(int, {String a, bool b})'.
+  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the type '(int, {String a, bool b})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
   (0, a: \"\", b: true).c;
                       ^" in (0, {a: "", b: true}){<unresolved>}.c;
diff --git a/pkg/front_end/testcases/records/record_get_errors.dart.strong.modular.expect b/pkg/front_end/testcases/records/record_get_errors.dart.strong.modular.expect
index c9639b1b2a2..c7429ddcf98 100644
--- a/pkg/front_end/testcases/records/record_get_errors.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/records/record_get_errors.dart.strong.modular.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 //   (0, "").$3;
 //           ^^
 //
-// pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the class '(int, {String a, bool b})'.
+// pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the type '(int, {String a, bool b})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
 //   (0, a: "", b: true).c;
 //                       ^
@@ -16,11 +16,11 @@ import self as self;
 import "dart:core" as core;
 
 static method method() → dynamic {
-  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
   (0, \"\").\$3;
           ^^" in (0, ""){<unresolved>}.$3;
-  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the class '(int, {String a, bool b})'.
+  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the type '(int, {String a, bool b})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
   (0, a: \"\", b: true).c;
                       ^" in (0, {a: "", b: true}){<unresolved>}.c;
diff --git a/pkg/front_end/testcases/records/record_get_errors.dart.strong.transformed.expect b/pkg/front_end/testcases/records/record_get_errors.dart.strong.transformed.expect
index c9639b1b2a2..c7429ddcf98 100644
--- a/pkg/front_end/testcases/records/record_get_errors.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/records/record_get_errors.dart.strong.transformed.expect
@@ -2,12 +2,12 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '$3' isn't defined for the class '(int, String)'.
+// pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '$3' isn't defined for the type '(int, String)'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named '$3'.
 //   (0, "").$3;
 //           ^^
 //
-// pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the class '(int, {String a, bool b})'.
+// pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the type '(int, {String a, bool b})'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
 //   (0, a: "", b: true).c;
 //                       ^
@@ -16,11 +16,11 @@ import self as self;
 import "dart:core" as core;
 
 static method method() → dynamic {
-  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '\$3' isn't defined for the class '(int, String)'.
+  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:6:11: Error: The getter '\$3' isn't defined for the type '(int, String)'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '\$3'.
   (0, \"\").\$3;
           ^^" in (0, ""){<unresolved>}.$3;
-  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the class '(int, {String a, bool b})'.
+  invalid-expression "pkg/front_end/testcases/records/record_get_errors.dart:7:23: Error: The getter 'c' isn't defined for the type '(int, {String a, bool b})'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
   (0, a: \"\", b: true).c;
                       ^" in (0, {a: "", b: true}){<unresolved>}.c;
diff --git a/pkg/front_end/testcases/records/record_literal_errors.dart.strong.expect b/pkg/front_end/testcases/records/record_literal_errors.dart.strong.expect
index 2bfbe72b28e..4c7fcdd0a0a 100644
--- a/pkg/front_end/testcases/records/record_literal_errors.dart.strong.expect
+++ b/pkg/front_end/testcases/records/record_literal_errors.dart.strong.expect
@@ -53,7 +53,7 @@ library;
 // dynamic keywordElement = (0, in);
 //                              ^^
 //
-// pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the class 'int'.
+// pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 // dynamic keywordProperty = (0, 1.in);
 //                                 ^^
@@ -109,7 +109,7 @@ library;
 //   dynamic keywordProperty = (0, 1.in);
 //                                   ^^
 //
-// pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the class 'int'.
+// pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 //   dynamic keywordProperty = (0, 1.in);
 //                                   ^^
@@ -124,7 +124,7 @@ library;
 //     (0, 1.in);
 //           ^^
 //
-// pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the class 'int'.
+// pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 //     (0, 1.in);
 //           ^^
@@ -141,7 +141,7 @@ class Class extends core::Object {
 To delegate a constructor to a super constructor, put the super call as an initializer.
     (0, super);
         ^^^^^");
-    (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the class 'int'.
+    (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
     (0, 1.in);
           ^^" in 1{<unresolved>}.in);
@@ -164,7 +164,7 @@ dynamic missingNamedElement = (0, a:);
 static field dynamic keywordElement = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:8:30: Error: Undefined name 'in'.
 dynamic keywordElement = (0, in);
                              ^^");
-static field dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the class 'int'.
+static field dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 dynamic keywordProperty = (0, 1.in);
                                 ^^" in 1{<unresolved>}.in);
@@ -186,7 +186,7 @@ Try renaming or removing one of the named record literal fields.
   dynamic keywordElement = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:16:32: Error: Undefined name 'in'.
   dynamic keywordElement = (0, in);
                                ^^");
-  dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the class 'int'.
+  dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
   dynamic keywordProperty = (0, 1.in);
                                   ^^" in 1{<unresolved>}.in);
diff --git a/pkg/front_end/testcases/records/record_literal_errors.dart.strong.modular.expect b/pkg/front_end/testcases/records/record_literal_errors.dart.strong.modular.expect
index 2bfbe72b28e..4c7fcdd0a0a 100644
--- a/pkg/front_end/testcases/records/record_literal_errors.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/records/record_literal_errors.dart.strong.modular.expect
@@ -53,7 +53,7 @@ library;
 // dynamic keywordElement = (0, in);
 //                              ^^
 //
-// pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the class 'int'.
+// pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 // dynamic keywordProperty = (0, 1.in);
 //                                 ^^
@@ -109,7 +109,7 @@ library;
 //   dynamic keywordProperty = (0, 1.in);
 //                                   ^^
 //
-// pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the class 'int'.
+// pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 //   dynamic keywordProperty = (0, 1.in);
 //                                   ^^
@@ -124,7 +124,7 @@ library;
 //     (0, 1.in);
 //           ^^
 //
-// pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the class 'int'.
+// pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 //     (0, 1.in);
 //           ^^
@@ -141,7 +141,7 @@ class Class extends core::Object {
 To delegate a constructor to a super constructor, put the super call as an initializer.
     (0, super);
         ^^^^^");
-    (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the class 'int'.
+    (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
     (0, 1.in);
           ^^" in 1{<unresolved>}.in);
@@ -164,7 +164,7 @@ dynamic missingNamedElement = (0, a:);
 static field dynamic keywordElement = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:8:30: Error: Undefined name 'in'.
 dynamic keywordElement = (0, in);
                              ^^");
-static field dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the class 'int'.
+static field dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 dynamic keywordProperty = (0, 1.in);
                                 ^^" in 1{<unresolved>}.in);
@@ -186,7 +186,7 @@ Try renaming or removing one of the named record literal fields.
   dynamic keywordElement = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:16:32: Error: Undefined name 'in'.
   dynamic keywordElement = (0, in);
                                ^^");
-  dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the class 'int'.
+  dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
   dynamic keywordProperty = (0, 1.in);
                                   ^^" in 1{<unresolved>}.in);
diff --git a/pkg/front_end/testcases/records/record_literal_errors.dart.strong.transformed.expect b/pkg/front_end/testcases/records/record_literal_errors.dart.strong.transformed.expect
index 2bfbe72b28e..4c7fcdd0a0a 100644
--- a/pkg/front_end/testcases/records/record_literal_errors.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/records/record_literal_errors.dart.strong.transformed.expect
@@ -53,7 +53,7 @@ library;
 // dynamic keywordElement = (0, in);
 //                              ^^
 //
-// pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the class 'int'.
+// pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 // dynamic keywordProperty = (0, 1.in);
 //                                 ^^
@@ -109,7 +109,7 @@ library;
 //   dynamic keywordProperty = (0, 1.in);
 //                                   ^^
 //
-// pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the class 'int'.
+// pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 //   dynamic keywordProperty = (0, 1.in);
 //                                   ^^
@@ -124,7 +124,7 @@ library;
 //     (0, 1.in);
 //           ^^
 //
-// pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the class 'int'.
+// pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the type 'int'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 //     (0, 1.in);
 //           ^^
@@ -141,7 +141,7 @@ class Class extends core::Object {
 To delegate a constructor to a super constructor, put the super call as an initializer.
     (0, super);
         ^^^^^");
-    (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the class 'int'.
+    (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:23:11: Error: The getter 'in' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
     (0, 1.in);
           ^^" in 1{<unresolved>}.in);
@@ -164,7 +164,7 @@ dynamic missingNamedElement = (0, a:);
 static field dynamic keywordElement = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:8:30: Error: Undefined name 'in'.
 dynamic keywordElement = (0, in);
                              ^^");
-static field dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the class 'int'.
+static field dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:9:33: Error: The getter 'in' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
 dynamic keywordProperty = (0, 1.in);
                                 ^^" in 1{<unresolved>}.in);
@@ -186,7 +186,7 @@ Try renaming or removing one of the named record literal fields.
   dynamic keywordElement = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:16:32: Error: Undefined name 'in'.
   dynamic keywordElement = (0, in);
                                ^^");
-  dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the class 'int'.
+  dynamic keywordProperty = (0, invalid-expression "pkg/front_end/testcases/records/record_literal_errors.dart:17:35: Error: The getter 'in' isn't defined for the type 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'in'.
   dynamic keywordProperty = (0, 1.in);
                                   ^^" in 1{<unresolved>}.in);
diff --git a/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.expect b/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.expect
index 7f49ac2ac20..39cfaf1411e 100644
--- a/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.expect
@@ -11,7 +11,7 @@ library;
 //   var foo = this();
 //             ^^^^
 //
-// pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the class 'FooClass'.
+// pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the type 'FooClass'.
 //  - 'FooClass' is from 'pkg/front_end/testcases/regress/invalid_this_reference_07.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   var foo = this();
@@ -21,7 +21,7 @@ import self as self;
 import "dart:core" as core;
 
 class FooClass extends core::Object {
-  field dynamic foo = invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the class 'FooClass'.
+  field dynamic foo = invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the type 'FooClass'.
  - 'FooClass' is from 'pkg/front_end/testcases/regress/invalid_this_reference_07.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   var foo = this();
diff --git a/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.modular.expect b/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.modular.expect
index 7f49ac2ac20..39cfaf1411e 100644
--- a/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.modular.expect
@@ -11,7 +11,7 @@ library;
 //   var foo = this();
 //             ^^^^
 //
-// pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the class 'FooClass'.
+// pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the type 'FooClass'.
 //  - 'FooClass' is from 'pkg/front_end/testcases/regress/invalid_this_reference_07.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   var foo = this();
@@ -21,7 +21,7 @@ import self as self;
 import "dart:core" as core;
 
 class FooClass extends core::Object {
-  field dynamic foo = invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the class 'FooClass'.
+  field dynamic foo = invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the type 'FooClass'.
  - 'FooClass' is from 'pkg/front_end/testcases/regress/invalid_this_reference_07.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   var foo = this();
diff --git a/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.outline.expect b/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.outline.expect
index 4e05383d346..790d2b2709d 100644
--- a/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.outline.expect
@@ -11,7 +11,7 @@ library;
 //   var foo = this();
 //             ^^^^
 //
-// pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the class 'FooClass'.
+// pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the type 'FooClass'.
 //  - 'FooClass' is from 'pkg/front_end/testcases/regress/invalid_this_reference_07.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   var foo = this();
diff --git a/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.transformed.expect
index 7f49ac2ac20..39cfaf1411e 100644
--- a/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/invalid_this_reference_07.dart.strong.transformed.expect
@@ -11,7 +11,7 @@ library;
 //   var foo = this();
 //             ^^^^
 //
-// pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the class 'FooClass'.
+// pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the type 'FooClass'.
 //  - 'FooClass' is from 'pkg/front_end/testcases/regress/invalid_this_reference_07.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'call'.
 //   var foo = this();
@@ -21,7 +21,7 @@ import self as self;
 import "dart:core" as core;
 
 class FooClass extends core::Object {
-  field dynamic foo = invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the class 'FooClass'.
+  field dynamic foo = invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_07.dart:17:13: Error: The method 'call' isn't defined for the type 'FooClass'.
  - 'FooClass' is from 'pkg/front_end/testcases/regress/invalid_this_reference_07.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   var foo = this();
diff --git a/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.expect b/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.expect
index 6bd947b0235..613cac1a6f0 100644
--- a/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.expect
@@ -20,7 +20,7 @@ library;
 //   late final foo2 = baz(0);
 //                     ^^^
 //
-// pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the type 'Foo'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
 //     print(bar);
 //           ^^^
@@ -53,7 +53,7 @@ static extension-type-member synthetic method Foo|constructor#_#new#tearOff(dyna
 static abstract extension-type-member method Foo|get#foo1(lowered dynamic #this) → invalid-type;
 static abstract extension-type-member method Foo|get#foo2(lowered dynamic #this) → invalid-type;
 static extension-type-member method Foo|baz(lowered final self::Foo% /* erasure=dynamic, declared=! */ #this, core::int i) → core::int {
-  core::print(invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the type 'Foo'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
     print(bar);
           ^^^" in #this{<unresolved>}.bar);
diff --git a/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.modular.expect b/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.modular.expect
index 6bd947b0235..613cac1a6f0 100644
--- a/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.modular.expect
@@ -20,7 +20,7 @@ library;
 //   late final foo2 = baz(0);
 //                     ^^^
 //
-// pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the type 'Foo'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
 //     print(bar);
 //           ^^^
@@ -53,7 +53,7 @@ static extension-type-member synthetic method Foo|constructor#_#new#tearOff(dyna
 static abstract extension-type-member method Foo|get#foo1(lowered dynamic #this) → invalid-type;
 static abstract extension-type-member method Foo|get#foo2(lowered dynamic #this) → invalid-type;
 static extension-type-member method Foo|baz(lowered final self::Foo% /* erasure=dynamic, declared=! */ #this, core::int i) → core::int {
-  core::print(invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the type 'Foo'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
     print(bar);
           ^^^" in #this{<unresolved>}.bar);
diff --git a/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.transformed.expect
index 6bd947b0235..613cac1a6f0 100644
--- a/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/invalid_this_reference_09.dart.strong.transformed.expect
@@ -20,7 +20,7 @@ library;
 //   late final foo2 = baz(0);
 //                     ^^^
 //
-// pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the class 'Foo'.
+// pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the type 'Foo'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
 //     print(bar);
 //           ^^^
@@ -53,7 +53,7 @@ static extension-type-member synthetic method Foo|constructor#_#new#tearOff(dyna
 static abstract extension-type-member method Foo|get#foo1(lowered dynamic #this) → invalid-type;
 static abstract extension-type-member method Foo|get#foo2(lowered dynamic #this) → invalid-type;
 static extension-type-member method Foo|baz(lowered final self::Foo% /* erasure=dynamic, declared=! */ #this, core::int i) → core::int {
-  core::print(invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the class 'Foo'.
+  core::print(invalid-expression "pkg/front_end/testcases/regress/invalid_this_reference_09.dart:10:11: Error: The getter 'bar' isn't defined for the type 'Foo'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'bar'.
     print(bar);
           ^^^" in #this{<unresolved>}.bar);
diff --git a/pkg/front_end/testcases/regress/issue_34225.dart.strong.expect b/pkg/front_end/testcases/regress/issue_34225.dart.strong.expect
index 10f66fbeb1e..529e2ded53c 100644
--- a/pkg/front_end/testcases/regress/issue_34225.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_34225.dart.strong.expect
@@ -12,7 +12,7 @@ library;
 //   set D(v) {} //# 02: compile-time error
 //       ^
 //
-// pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the class 'C'.
+// pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/regress/issue_34225.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'C'.
 //   c.C = 5;
@@ -35,7 +35,7 @@ class D extends core::Object {
 }
 static method main() → dynamic {
   self::C c = new self::C::•();
-  invalid-expression "pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/regress/issue_34225.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'C'.
   c.C = 5;
diff --git a/pkg/front_end/testcases/regress/issue_34225.dart.strong.modular.expect b/pkg/front_end/testcases/regress/issue_34225.dart.strong.modular.expect
index 10f66fbeb1e..529e2ded53c 100644
--- a/pkg/front_end/testcases/regress/issue_34225.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/regress/issue_34225.dart.strong.modular.expect
@@ -12,7 +12,7 @@ library;
 //   set D(v) {} //# 02: compile-time error
 //       ^
 //
-// pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the class 'C'.
+// pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/regress/issue_34225.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'C'.
 //   c.C = 5;
@@ -35,7 +35,7 @@ class D extends core::Object {
 }
 static method main() → dynamic {
   self::C c = new self::C::•();
-  invalid-expression "pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/regress/issue_34225.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'C'.
   c.C = 5;
diff --git a/pkg/front_end/testcases/regress/issue_34225.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_34225.dart.strong.transformed.expect
index 10f66fbeb1e..529e2ded53c 100644
--- a/pkg/front_end/testcases/regress/issue_34225.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34225.dart.strong.transformed.expect
@@ -12,7 +12,7 @@ library;
 //   set D(v) {} //# 02: compile-time error
 //       ^
 //
-// pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the class 'C'.
+// pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the type 'C'.
 //  - 'C' is from 'pkg/front_end/testcases/regress/issue_34225.dart'.
 // Try correcting the name to the name of an existing setter, or defining a setter or field named 'C'.
 //   c.C = 5;
@@ -35,7 +35,7 @@ class D extends core::Object {
 }
 static method main() → dynamic {
   self::C c = new self::C::•();
-  invalid-expression "pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the class 'C'.
+  invalid-expression "pkg/front_end/testcases/regress/issue_34225.dart:15:5: Error: The setter 'C' isn't defined for the type 'C'.
  - 'C' is from 'pkg/front_end/testcases/regress/issue_34225.dart'.
 Try correcting the name to the name of an existing setter, or defining a setter or field named 'C'.
   c.C = 5;
diff --git a/pkg/front_end/testcases/regress/issue_34563.dart.strong.expect b/pkg/front_end/testcases/regress/issue_34563.dart.strong.expect
index 5c8710718e9..713741a0bbd 100644
--- a/pkg/front_end/testcases/regress/issue_34563.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_34563.dart.strong.expect
@@ -18,25 +18,25 @@ library;
 // class C3 on C1 with M3 {}
 //          ^^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the type 'C2'.
 //  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
 //   c2.m + c2.c;
 //      ^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the type 'C2'.
 //  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
 //   c2.m + c2.c;
 //             ^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the class 'C3'.
+// pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the type 'C3'.
 //  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
 //   c3.m + c3.c;
 //      ^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the class 'C3'.
+// pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the type 'C3'.
 //  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
 //   c3.m + c3.c;
@@ -72,21 +72,21 @@ class C3 extends core::Object {
 }
 static method main() → dynamic {
   self::C2 c2 = new self::C2::•();
-  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the class 'C2'.
+  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the type 'C2'.
  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
   c2.m + c2.c;
-     ^" in c2{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the class 'C2'.
+     ^" in c2{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the type 'C2'.
  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
   c2.m + c2.c;
             ^" in c2{<unresolved>}.c);
   self::C3 c3 = new self::C3::•();
-  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the class 'C3'.
+  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the type 'C3'.
  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
   c3.m + c3.c;
-     ^" in c3{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the class 'C3'.
+     ^" in c3{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the type 'C3'.
  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
   c3.m + c3.c;
diff --git a/pkg/front_end/testcases/regress/issue_34563.dart.strong.modular.expect b/pkg/front_end/testcases/regress/issue_34563.dart.strong.modular.expect
index 5c8710718e9..713741a0bbd 100644
--- a/pkg/front_end/testcases/regress/issue_34563.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/regress/issue_34563.dart.strong.modular.expect
@@ -18,25 +18,25 @@ library;
 // class C3 on C1 with M3 {}
 //          ^^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the type 'C2'.
 //  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
 //   c2.m + c2.c;
 //      ^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the type 'C2'.
 //  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
 //   c2.m + c2.c;
 //             ^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the class 'C3'.
+// pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the type 'C3'.
 //  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
 //   c3.m + c3.c;
 //      ^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the class 'C3'.
+// pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the type 'C3'.
 //  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
 //   c3.m + c3.c;
@@ -72,21 +72,21 @@ class C3 extends core::Object {
 }
 static method main() → dynamic {
   self::C2 c2 = new self::C2::•();
-  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the class 'C2'.
+  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the type 'C2'.
  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
   c2.m + c2.c;
-     ^" in c2{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the class 'C2'.
+     ^" in c2{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the type 'C2'.
  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
   c2.m + c2.c;
             ^" in c2{<unresolved>}.c);
   self::C3 c3 = new self::C3::•();
-  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the class 'C3'.
+  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the type 'C3'.
  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
   c3.m + c3.c;
-     ^" in c3{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the class 'C3'.
+     ^" in c3{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the type 'C3'.
  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
   c3.m + c3.c;
diff --git a/pkg/front_end/testcases/regress/issue_34563.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_34563.dart.strong.transformed.expect
index 5c8710718e9..713741a0bbd 100644
--- a/pkg/front_end/testcases/regress/issue_34563.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34563.dart.strong.transformed.expect
@@ -18,25 +18,25 @@ library;
 // class C3 on C1 with M3 {}
 //          ^^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the type 'C2'.
 //  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
 //   c2.m + c2.c;
 //      ^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the class 'C2'.
+// pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the type 'C2'.
 //  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
 //   c2.m + c2.c;
 //             ^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the class 'C3'.
+// pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the type 'C3'.
 //  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
 //   c3.m + c3.c;
 //      ^
 //
-// pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the class 'C3'.
+// pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the type 'C3'.
 //  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 // Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
 //   c3.m + c3.c;
@@ -72,21 +72,21 @@ class C3 extends core::Object {
 }
 static method main() → dynamic {
   self::C2 c2 = new self::C2::•();
-  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the class 'C2'.
+  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:6: Error: The getter 'm' isn't defined for the type 'C2'.
  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
   c2.m + c2.c;
-     ^" in c2{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the class 'C2'.
+     ^" in c2{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:23:13: Error: The getter 'c' isn't defined for the type 'C2'.
  - 'C2' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
   c2.m + c2.c;
             ^" in c2{<unresolved>}.c);
   self::C3 c3 = new self::C3::•();
-  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the class 'C3'.
+  invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:6: Error: The getter 'm' isn't defined for the type 'C3'.
  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'm'.
   c3.m + c3.c;
-     ^" in c3{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the class 'C3'.
+     ^" in c3{<unresolved>}.m{dynamic}.+(invalid-expression "pkg/front_end/testcases/regress/issue_34563.dart:25:13: Error: The getter 'c' isn't defined for the type 'C3'.
  - 'C3' is from 'pkg/front_end/testcases/regress/issue_34563.dart'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'c'.
   c3.m + c3.c;
diff --git a/pkg/vm_service/test/evaluate_on_mixin_application_test.dart b/pkg/vm_service/test/evaluate_on_mixin_application_test.dart
index 0b8d5f3151a..94044f06956 100644
--- a/pkg/vm_service/test/evaluate_on_mixin_application_test.dart
+++ b/pkg/vm_service/test/evaluate_on_mixin_application_test.dart
@@ -48,7 +48,7 @@ final tests = <IsolateTest>[
       expect(e.code, RPCErrorKind.kExpressionCompilationError.code);
       expect(
         e.details,
-        contains("The getter 'foo' isn't defined for the class 'MA'"),
+        contains("The getter 'foo' isn't defined for the type 'MA'"),
       );
     }
   },
diff --git a/tests/corelib/core_runtime_types_static_test.dart b/tests/corelib/core_runtime_types_static_test.dart
index 8b9f1d74d44..11877320c90 100644
--- a/tests/corelib/core_runtime_types_static_test.dart
+++ b/tests/corelib/core_runtime_types_static_test.dart
@@ -23,7 +23,7 @@ class CoreStaticTypesTest {
     q[0] = 'x';
     // [error column 6, length 3]
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-    // [cfe] The operator '[]=' isn't defined for the class 'String'.
+    // [cfe] The operator '[]=' isn't defined for the type 'String'.
   }
 
   static testStringMethods() {
diff --git a/tests/corelib/symbol_reserved_word_error_test.dart b/tests/corelib/symbol_reserved_word_error_test.dart
index 192beafe76c..128932032e1 100644
--- a/tests/corelib/symbol_reserved_word_error_test.dart
+++ b/tests/corelib/symbol_reserved_word_error_test.dart
@@ -14,7 +14,7 @@ main() {
   #void.foo;
   //    ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'foo' isn't defined for the class 'Symbol'.
+  // [cfe] The getter 'foo' isn't defined for the type 'Symbol'.
 
   #foo.void;
   //   ^^^^
diff --git a/tests/ffi/static_checks/address_position_cascade_test.dart b/tests/ffi/static_checks/address_position_cascade_test.dart
index 42f6a6947de..0854b655baf 100644
--- a/tests/ffi/static_checks/address_position_cascade_test.dart
+++ b/tests/ffi/static_checks/address_position_cascade_test.dart
@@ -23,133 +23,133 @@ external void myNativeWith3Param(
 void testDefinedLeaf() {
   final buffer = Int8List.fromList([1]);
   myNativeWith2Param(buffer.address, buffer.address);
-  //                        ^^^^^^^
-  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
   //                 ^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+  //                        ^
+  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
 
   myNativeWith2Param(buffer.address.cast(), buffer.address.cast<Void>());
-  //                                                       ^^^^^^^^^^^^
-  // [cfe] The argument type 'Pointer<Void>' can't be assigned to the parameter type 'Pointer<Int8>'.
   //                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+  //                                                       ^
+  // [cfe] The argument type 'Pointer<Void>' can't be assigned to the parameter type 'Pointer<Int8>'.
 
   myNativeWith3Param(buffer.address, buffer.address, buffer.address.cast());
-  //                        ^^^^^^^
-  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
   //                 ^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+  //                        ^
+  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
 
   // dart format off
   myNativeWith3Param(
       buffer.address.cast(),
       /* */ buffer.address.cast<Void>(),
-      //                   ^^^^^^^^^^^^
-      // [cfe] The argument type 'Pointer<Void>' can't be assigned to the parameter type 'Pointer<Int8>'.
       //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+      //                   ^
+      // [cfe] The argument type 'Pointer<Void>' can't be assigned to the parameter type 'Pointer<Int8>'.
       buffer.address.cast());
 
   myNativeWith3Param(buffer.address.cast(), buffer.address, buffer.address);
-  //                                                               ^^^^^^^
-  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
   //                                                        ^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+  //                                                               ^
+  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
 
   myNativeWith3Param(
       /**/ buffer.address,
-      //          ^^^^^^^
-      // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
       //   ^^^^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+      //          ^
+      // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
       /**/ buffer.address.cast<Void>(),
-      //                  ^^^^^^^^^^^^
-      // [cfe] The argument type 'Pointer<Void>' can't be assigned to the parameter type 'Pointer<Int8>'.
       //   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+      //                  ^
+      // [cfe] The argument type 'Pointer<Void>' can't be assigned to the parameter type 'Pointer<Int8>'.
       buffer.address.cast());
 
   myNativeWith3Param(
       buffer.address.cast(),
       /**/ buffer.address.cast<Void>(),
-      //                  ^^^^^^^^^^^^
-      // [cfe] The argument type 'Pointer<Void>' can't be assigned to the parameter type 'Pointer<Int8>'.
       //   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+      //                  ^
+      // [cfe] The argument type 'Pointer<Void>' can't be assigned to the parameter type 'Pointer<Int8>'.
       buffer.address);
-  //         ^^^^^^^
-  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
   //  ^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+  //         ^
+  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
   myNativeWith3Param(
       /**/ buffer.address
-      //          ^^^^^^^
-      // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
       //   ^^^^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+      //          ^
+      // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
       ,
       buffer.address,
       buffer.address);
-  //         ^^^^^^^
-  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
   //  ^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+  //         ^
+  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
 
   myNativeWith3Param(
       /**/ buffer.address,
-      //          ^^^^^^^
-      // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
       //   ^^^^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+      //          ^
+      // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
       /**/ buffer.address.cast<Void>(),
-      //                  ^^^^^^^^^^^^
-      // [cfe] The argument type 'Pointer<Void>' can't be assigned to the parameter type 'Pointer<Int8>'.
       //   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+      //                  ^
+      // [cfe] The argument type 'Pointer<Void>' can't be assigned to the parameter type 'Pointer<Int8>'.
       buffer.address);
-  //         ^^^^^^^
-  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
   //  ^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
+  //         ^
+  // [cfe] The argument type 'Pointer<Int8>' can't be assigned to the parameter type 'Pointer<Void>'.
 }
 // dart format on
 
 void testUndefinedLeaf() {
   final buffer = Int8List.fromList([1]);
   myNativeWith2Param(buffer.address.cast(), buffer.address.doesntExist);
-  //                                                       ^^^^^^^^^^^
-  // [cfe] The getter 'doesntExist' isn't defined for the class 'Pointer<Int8>'.
-  // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
   //                                               ^^^^^^^
-  // [cfe] The '.address' expression can only be used as argument to a leaf native external call.
   // [analyzer] COMPILE_TIME_ERROR.ADDRESS_POSITION
+  // [cfe] The '.address' expression can only be used as argument to a leaf native external call.
+  //                                                       ^^^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
+  // [cfe] The getter 'doesntExist' isn't defined for the type 'Pointer<Int8>'.
 
   myNativeWith2Param(buffer.address.cast<Int8>().doesntExist, buffer.address);
-  //                                             ^^^^^^^^^^^
-  // [cfe] The getter 'doesntExist' isn't defined for the class 'Pointer<Int8>'.
-  // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
   //                        ^^^^^^^
-  // [cfe] The '.address' expression can only be used as argument to a leaf native external call.
   // [analyzer] COMPILE_TIME_ERROR.ADDRESS_POSITION
+  // [cfe] The '.address' expression can only be used as argument to a leaf native external call.
+  //                                             ^^^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
+  // [cfe] The getter 'doesntExist' isn't defined for the type 'Pointer<Int8>'.
 }
 
 void testUndefinedNonLeaf() {
   final buffer = Int8List.fromList([1]);
 
   myNonLeafNative(buffer.address.cast().doesntExist);
+  //                     ^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.ADDRESS_POSITION
+  // [cfe] The '.address' expression can only be used as argument to a leaf native external call.
   //                                    ^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'doesntExist' isn't defined for the class 'Pointer<NativeType>'.
+  // [cfe] The getter 'doesntExist' isn't defined for the type 'Pointer<NativeType>'.
+  myNonLeafNative(buffer.address.doesntExist);
   //                     ^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ADDRESS_POSITION
   // [cfe] The '.address' expression can only be used as argument to a leaf native external call.
-  myNonLeafNative(buffer.address.doesntExist);
   //                             ^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'doesntExist' isn't defined for the class 'Pointer<Int8>'.
-  //                     ^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.ADDRESS_POSITION
-  // [cfe] The '.address' expression can only be used as argument to a leaf native external call.
+  // [cfe] The getter 'doesntExist' isn't defined for the type 'Pointer<Int8>'.
 }
 
 void testDefinedNonLeaf() {
@@ -157,20 +157,20 @@ void testDefinedNonLeaf() {
   myNonLeafNative(buffer.address.cast().address);
   //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
-  //                                    ^^^^^^^
-  // [cfe] The argument type 'int' can't be assigned to the parameter type 'Pointer<Void>'.
   //                     ^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ADDRESS_POSITION
   // [cfe] The '.address' expression can only be used as argument to a leaf native external call.
+  //                                    ^
+  // [cfe] The argument type 'int' can't be assigned to the parameter type 'Pointer<Void>'.
 
   myNonLeafNative(buffer.address.address);
   //              ^^^^^^^^^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
-  //                             ^^^^^^^
-  // [cfe] The argument type 'int' can't be assigned to the parameter type 'Pointer<Void>'.
   //                     ^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ADDRESS_POSITION
   // [cfe] The '.address' expression can only be used as argument to a leaf native external call.
+  //                             ^
+  // [cfe] The argument type 'int' can't be assigned to the parameter type 'Pointer<Void>'.
 }
 
 void main() {
diff --git a/tests/ffi/static_checks/vmspecific_static_checks_test.dart b/tests/ffi/static_checks/vmspecific_static_checks_test.dart
index d406c5fa52b..dd7a3f77bee 100644
--- a/tests/ffi/static_checks/vmspecific_static_checks_test.dart
+++ b/tests/ffi/static_checks/vmspecific_static_checks_test.dart
@@ -84,8 +84,8 @@ void testGetGeneric() {
     int result = -1;
     result = p.value;
     //         ^^^^^
-    // [cfe] The getter 'value' isn't defined for the class 'Pointer<NativeType>'.
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
+    // [cfe] The getter 'value' isn't defined for the type 'Pointer<NativeType>'.
     return result;
   }
 
@@ -119,8 +119,8 @@ void testGetVoid() {
 
   p2.value;
   // ^^^^^
-  // [cfe] The getter 'value' isn't defined for the class 'Pointer<Void>'.
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
+  // [cfe] The getter 'value' isn't defined for the type 'Pointer<Void>'.
 
   calloc.free(p1);
 }
@@ -129,8 +129,8 @@ void testGetNativeFunction() {
   Pointer<NativeFunction<Int8UnOp>> p = Pointer.fromAddress(1337);
   IntUnOp f = p.value;
   //            ^^^^^
-  // [cfe] The getter 'value' isn't defined for the class 'Pointer<NativeFunction<Int8 Function(Int8)>>'.
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
+  // [cfe] The getter 'value' isn't defined for the type 'Pointer<NativeFunction<Int8 Function(Int8)>>'.
 }
 
 void testGetNativeType() {
@@ -144,10 +144,10 @@ void testGetTypeMismatch() {
 
   // this fails to compile due to type mismatch
   Pointer<Int8> p2 = p.value;
-  //                   ^
-  // [cfe] A value of type 'Pointer<Int16>' can't be assigned to a variable of type 'Pointer<Int8>'.
   //                 ^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.INVALID_ASSIGNMENT
+  //                   ^
+  // [cfe] A value of type 'Pointer<Int16>' can't be assigned to a variable of type 'Pointer<Int8>'.
 
   calloc.free(p);
 }
@@ -156,8 +156,8 @@ void testSetGeneric() {
   void generic(Pointer p) {
     p.value = 123;
     //^^^^^
-    // [cfe] The setter 'value' isn't defined for the class 'Pointer<NativeType>'.
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
+    // [cfe] The setter 'value' isn't defined for the type 'Pointer<NativeType>'.
   }
 
   Pointer<Int8> p = calloc();
@@ -172,8 +172,8 @@ void testSetGeneric2() {
     Pointer<Int8> p = calloc();
     p.value = arg;
     //        ^^^
-    // [cfe] A value of type 'T' can't be assigned to a variable of type 'int'.
     // [analyzer] COMPILE_TIME_ERROR.INVALID_ASSIGNMENT
+    // [cfe] A value of type 'T' can't be assigned to a variable of type 'int'.
     calloc.free(p);
   }
 
@@ -186,8 +186,8 @@ void testSetVoid() {
 
   p2.value = 1234;
   // ^^^^^
-  // [cfe] The setter 'value' isn't defined for the class 'Pointer<Void>'.
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
+  // [cfe] The setter 'value' isn't defined for the type 'Pointer<Void>'.
 
   calloc.free(p1);
 }
@@ -197,8 +197,8 @@ void testSetNativeFunction() {
   IntUnOp f = (a) => a + 1;
   p.value = f;
   //^^^^^
-  // [cfe] The setter 'value' isn't defined for the class 'Pointer<NativeFunction<Int8 Function(Int8)>>'.
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
+  // [cfe] The setter 'value' isn't defined for the type 'Pointer<NativeFunction<Int8 Function(Int8)>>'.
 }
 
 void testSetNativeType() {
@@ -215,8 +215,8 @@ void testSetTypeMismatch() {
   // this fails to compile due to type mismatch
   p.value = pHelper;
   //        ^^^^^^^
-  // [cfe] A value of type 'Pointer<Int8>' can't be assigned to a variable of type 'Pointer<Int16>'.
   // [analyzer] COMPILE_TIME_ERROR.INVALID_ASSIGNMENT
+  // [cfe] A value of type 'Pointer<Int8>' can't be assigned to a variable of type 'Pointer<Int16>'.
 
   calloc.free(pHelper);
   calloc.free(p);
@@ -256,8 +256,8 @@ void testAsFunctionWrongNativeFunctionSignature() {
   Pointer<NativeFunction<IntUnOp>> p;
   Function f = p.asFunction<IntUnOp>();
   //           ^
-  // [cfe] Non-nullable variable 'p' must be assigned before it can be used.
   // [analyzer] COMPILE_TIME_ERROR.NOT_ASSIGNED_POTENTIALLY_NON_NULLABLE_LOCAL_VARIABLE
+  // [cfe] Non-nullable variable 'p' must be assigned before it can be used.
   //             ^
   // [cfe] Expected type 'NativeFunction<int Function(int)>' to be a valid and instantiated subtype of 'NativeType'.
   //                        ^^^^^^^
@@ -296,8 +296,8 @@ void testFromFunctionGeneric() {
     Pointer<NativeFunction<NativeDoubleUnOp>> result = nullptr;
     result = Pointer.fromFunction(f);
     //                            ^
-    // [cfe] fromFunction expects a static function as parameter. dart:ffi only supports calling static Dart functions from native code. Closures and tear-offs are not supported because they can capture context.
     // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
+    // [cfe] fromFunction expects a static function as parameter. dart:ffi only supports calling static Dart functions from native code. Closures and tear-offs are not supported because they can capture context.
     return result;
   }
 
@@ -309,8 +309,8 @@ void testFromFunctionGeneric2() {
     Pointer<NativeFunction<T>> result = nullptr;
     result = Pointer.fromFunction(myTimesThree);
     //               ^^^^^^^^^^^^
-    // [cfe] Expected type 'NativeFunction<T>' to be a valid and instantiated subtype of 'NativeType'.
     // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
+    // [cfe] Expected type 'NativeFunction<T>' to be a valid and instantiated subtype of 'NativeType'.
     return result;
   }
 
@@ -319,19 +319,19 @@ void testFromFunctionGeneric2() {
 
 void testFromFunctionWrongNativeFunctionSignature() {
   Pointer.fromFunction<IntUnOp>(myTimesFour);
-  //                   ^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
   //      ^
   // [cfe] Expected type 'NativeFunction<int Function(int)>' to be a valid and instantiated subtype of 'NativeType'.
+  //                   ^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
 }
 
 void testFromFunctionTypeMismatch() {
   Pointer<NativeFunction<NativeDoubleUnOp>> p;
   p = Pointer.fromFunction(myTimesFour);
-  //                       ^^^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
   //          ^
   // [cfe] Expected type 'int Function(int)' to be 'double Function(double)', which is the Dart type corresponding to 'NativeFunction<Double Function(Double)>'.
+  //                       ^^^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
 }
 
 void testFromFunctionClosure() {
@@ -360,20 +360,20 @@ void testFromFunctionTearOff() {
 
 void testFromFunctionAbstract() {
   Pointer.fromFunction<Function>(testFromFunctionAbstract);
-  //                   ^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
   //      ^
   // [cfe] Expected type 'NativeFunction<Function>' to be a valid and instantiated subtype of 'NativeType'.
+  //                   ^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
 }
 
 void testFromFunctionFunctionExceptionValueMustBeConst() {
   final notAConst = 1.1;
   Pointer<NativeFunction<NativeDoubleUnOp>> p;
   p = Pointer.fromFunction(myTimesThree, notAConst);
-  //                                     ^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_MUST_BE_A_CONSTANT
   //          ^
   // [cfe] Exceptional return value must be a constant.
+  //                                     ^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_MUST_BE_A_CONSTANT
 }
 
 typedef NativeVoidFunc = Void Function();
@@ -391,10 +391,10 @@ void testNativeCallableListenerGeneric() {
   NativeCallable? generic<T extends Function>(T f) {
     NativeCallable<NativeVoidFunc>? result;
     result = NativeCallable.listener(f);
-    //                               ^
-    // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
     //                      ^
     // [cfe] Expected type 'T' to be 'void Function()', which is the Dart type corresponding to 'NativeFunction<Void Function()>'.
+    //                               ^
+    // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
     return result;
   }
 
@@ -419,44 +419,44 @@ void testNativeCallableListenerGeneric2() {
 
 void testNativeCallableListenerWrongNativeFunctionSignature() {
   /**/ NativeCallable<NativeVoidFunc>.listener(myVoidFunc2);
-  //                                           ^^^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
   //   ^
   // [cfe] Expected type 'void Function(int)' to be 'void Function()', which is the Dart type corresponding to 'NativeFunction<Void Function()>'.
+  //                                           ^^^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
 }
 
 void testNativeCallableListenerTypeMismatch() {
   NativeCallable<NativeVoidFunc> p;
   p = NativeCallable.listener(myVoidFunc2);
-  //                          ^^^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
   //                 ^
   // [cfe] Expected type 'void Function(int)' to be 'void Function()', which is the Dart type corresponding to 'NativeFunction<Void Function()>'.
+  //                          ^^^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
 }
 
 void testNativeCallableListenerAbstract() {
   final f = NativeCallable<Function>.listener(
       //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-      // [cfe] Expected type 'NativeFunction<Function>' to be a valid and instantiated subtype of 'NativeType'.
       // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
+      // [cfe] Expected type 'NativeFunction<Function>' to be a valid and instantiated subtype of 'NativeType'.
       testNativeCallableListenerAbstract);
 }
 
 void testNativeCallableListenerMustReturnVoid() {
   final f = NativeCallable<NativeDoubleUnOp>.listener(myTimesThree);
   //                                                  ^^^^^^^^^^^^
-  // [cfe] The return type of the function passed to NativeCallable.listener must be void rather than 'double'.
   // [analyzer] COMPILE_TIME_ERROR.MUST_RETURN_VOID
+  // [cfe] The return type of the function passed to NativeCallable.listener must be void rather than 'double'.
 }
 
 void testNativeCallableIsolateLocalGeneric() {
   NativeCallable<Function> generic<T extends Function>(T f) {
     late NativeCallable<NativeDoubleUnOp> result;
     result = NativeCallable.isolateLocal(f);
-    //                                   ^
-    // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
     //                      ^
     // [cfe] Expected type 'T' to be 'double Function(double)', which is the Dart type corresponding to 'NativeFunction<Double Function(Double)>'.
+    //                                   ^
+    // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
     return result;
   }
 
@@ -467,10 +467,10 @@ void testNativeCallableIsolateLocalGeneric2() {
   NativeCallable<T> generic<T extends Function>() {
     late NativeCallable<T> result;
     result = NativeCallable.isolateLocal(myTimesThree);
-    //                      ^
-    // [cfe] Expected type 'NativeFunction<T>' to be a valid and instantiated subtype of 'NativeType'.
     //       ^^^^^^^^^^^^^^^^^^^^^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
+    //                      ^
+    // [cfe] Expected type 'NativeFunction<T>' to be a valid and instantiated subtype of 'NativeType'.
     return result;
   }
 
@@ -481,17 +481,16 @@ void testNativeCallableIsolateLocalWrongNativeFunctionSignature() {
   /**/ NativeCallable<IntUnOp>.isolateLocal(myTimesFour);
   //   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
-  //   ^
   // [cfe] Expected type 'NativeFunction<int Function(int)>' to be a valid and instantiated subtype of 'NativeType'.
 }
 
 void testNativeCallableIsolateLocalTypeMismatch() {
   NativeCallable<NativeDoubleUnOp> p;
   p = NativeCallable.isolateLocal(myTimesFour);
-  //                              ^^^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
   //                 ^
   // [cfe] Expected type 'int Function(int)' to be 'double Function(double)', which is the Dart type corresponding to 'NativeFunction<Double Function(Double)>'.
+  //                              ^^^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
 }
 
 void testNativeCallableIsolateLocalTearOff() {
@@ -507,18 +506,18 @@ void testNativeCallableIsolateLocalTearOff() {
 void testNativeCallableIsolateLocalAbstract() {
   NativeCallable<Function>.isolateLocal(testNativeCallableIsolateLocalAbstract);
 //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
-  // [cfe] Expected type 'NativeFunction<Function>' to be a valid and instantiated subtype of 'NativeType'.
+// [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
+// [cfe] Expected type 'NativeFunction<Function>' to be a valid and instantiated subtype of 'NativeType'.
 }
 
 void testNativeCallableIsolateLocalFunctionExceptionValueMustBeConst() {
   final notAConst = 1.1;
   NativeCallable<NativeDoubleUnOp> p;
   p = NativeCallable.isolateLocal(myTimesThree, exceptionalReturn: notAConst);
-  //                                                               ^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_MUST_BE_A_CONSTANT
   //                 ^
   // [cfe] Exceptional return value must be a constant.
+  //                                                               ^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_MUST_BE_A_CONSTANT
 }
 
 void testLookupFunctionGeneric() {
@@ -526,10 +525,10 @@ void testLookupFunctionGeneric() {
     DynamicLibrary l = DynamicLibrary.process();
     Function result = () => "dummy";
     result = l.lookupFunction<T, DoubleUnOp>("cos");
-    //                        ^
-    // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
     //         ^
     // [cfe] Expected type 'NativeFunction<T>' to be a valid and instantiated subtype of 'NativeType'.
+    //                        ^
+    // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
     return result;
   }
 
@@ -541,10 +540,10 @@ void testLookupFunctionGeneric2() {
     DynamicLibrary l = DynamicLibrary.process();
     Function result = () => "dummy";
     result = l.lookupFunction<NativeDoubleUnOp, T>("cos");
-    //                                          ^
-    // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
     //         ^
     // [cfe] Expected type 'T' to be 'double Function(double)', which is the Dart type corresponding to 'NativeFunction<Double Function(Double)>'.
+    //                                          ^
+    // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
     return result;
   }
 
@@ -554,19 +553,19 @@ void testLookupFunctionGeneric2() {
 void testLookupFunctionWrongNativeFunctionSignature() {
   DynamicLibrary l = DynamicLibrary.process();
   l.lookupFunction<IntUnOp, IntUnOp>("cos");
-  //               ^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
   //^
   // [cfe] Expected type 'NativeFunction<int Function(int)>' to be a valid and instantiated subtype of 'NativeType'.
+  //               ^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_NATIVE_FUNCTION_TYPE
 }
 
 void testLookupFunctionTypeMismatch() {
   DynamicLibrary l = DynamicLibrary.process();
   l.lookupFunction<NativeDoubleUnOp, IntUnOp>("cos");
-  //                                 ^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
   //^
   // [cfe] Expected type 'int Function(int)' to be 'double Function(double)', which is the Dart type corresponding to 'NativeFunction<Double Function(Double)>'.
+  //                                 ^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.MUST_BE_A_SUBTYPE
 }
 
 typedef PointervoidN = Void Function(Pointer<void>);
@@ -602,10 +601,10 @@ final class TestStruct extends Struct {
 // Cannot extend structs.
 class TestStruct3 extends TestStruct {}
 //    ^^^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
 // [cfe] Class 'TestStruct' cannot be extended or implemented.
 // [cfe] TestStruct 'TestStruct3' is empty. Empty structs and unions are undefined behavior.
 // [cfe] The type 'TestStruct3' must be 'base', 'final' or 'sealed' because the supertype 'TestStruct' is 'final'.
-// [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
 //                        ^^^^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_STRUCT_CLASS
 
@@ -670,8 +669,8 @@ final class TestStruct8 extends Struct {
   @Double()
   double z = 10.0;
   //     ^
-  // [cfe] Field 'z' is a dart:ffi Pointer to a struct field and therefore cannot be initialized before constructor execution.
   // [analyzer] COMPILE_TIME_ERROR.FIELD_MUST_BE_EXTERNAL_IN_STRUCT
+  // [cfe] Field 'z' is a dart:ffi Pointer to a struct field and therefore cannot be initialized before constructor execution.
 
   external Pointer notEmpty;
 }
@@ -681,8 +680,8 @@ final class TestStruct9 extends Struct {
   @Double()
   double z;
   //     ^
-  // [cfe] Field 'z' is a dart:ffi Pointer to a struct field and therefore cannot be initialized before constructor execution.
   // [analyzer] COMPILE_TIME_ERROR.FIELD_MUST_BE_EXTERNAL_IN_STRUCT
+  // [cfe] Field 'z' is a dart:ffi Pointer to a struct field and therefore cannot be initialized before constructor execution.
 
   external Pointer notEmpty;
 
@@ -698,8 +697,8 @@ class TestStruct11<T> extends Struct<TestStruct11<dynamic>> {}
 // [analyzer] COMPILE_TIME_ERROR.GENERIC_STRUCT_SUBCLASS
 // [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-// [cfe] Expected 0 type arguments.
 // [analyzer] COMPILE_TIME_ERROR.WRONG_NUMBER_OF_TYPE_ARGUMENTS
+// [cfe] Expected 0 type arguments.
 
 // Structs may not appear inside structs (currently, there is no suitable
 // annotation).
@@ -729,85 +728,85 @@ final class TestStruct13 extends Struct {
 
 class ENativeType extends NativeType {}
 //                        ^^^^^^^^^^
-// [cfe] The class 'NativeType' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'NativeType' can't be extended outside of its library because it's a final class.
 
 class EInt8 extends Int8 {}
 //                  ^^^^
-// [cfe] The class 'Int8' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Int8' can't be extended outside of its library because it's a final class.
 
 class EInt16 extends Int16 {}
 //                   ^^^^^
-// [cfe] The class 'Int16' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Int16' can't be extended outside of its library because it's a final class.
 
 class EInt32 extends Int32 {}
 //                   ^^^^^
-// [cfe] The class 'Int32' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Int32' can't be extended outside of its library because it's a final class.
 
 class EInt64 extends Int64 {}
 //                   ^^^^^
-// [cfe] The class 'Int64' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Int64' can't be extended outside of its library because it's a final class.
 
 class EUint8 extends Uint8 {}
 //                   ^^^^^
-// [cfe] The class 'Uint8' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Uint8' can't be extended outside of its library because it's a final class.
 
 class EUint16 extends Uint16 {}
 //                    ^^^^^^
-// [cfe] The class 'Uint16' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Uint16' can't be extended outside of its library because it's a final class.
 
 class EUint32 extends Uint32 {}
 //                    ^^^^^^
-// [cfe] The class 'Uint32' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Uint32' can't be extended outside of its library because it's a final class.
 
 class EUint64 extends Uint64 {}
 //                    ^^^^^^
-// [cfe] The class 'Uint64' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Uint64' can't be extended outside of its library because it's a final class.
 
 class EIntPtr extends IntPtr {}
-//                    ^^^^^^
-// [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
-// [cfe] The class 'IntPtr' can't be extended outside of its library because it's a final class.
 //    ^
 // [cfe] Class 'IntPtr' cannot be extended or implemented.
 // [cfe] Classes extending 'AbiSpecificInteger' must have exactly one 'AbiSpecificIntegerMapping' annotation specifying the mapping from ABI to a NativeType integer with a fixed size.
 // [cfe] Classes extending 'AbiSpecificInteger' must have exactly one const constructor, no other members, and no type arguments.
+//                    ^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'IntPtr' can't be extended outside of its library because it's a final class.
 
 class EFloat extends Float {}
 //                   ^^^^^
-// [cfe] The class 'Float' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Float' can't be extended outside of its library because it's a final class.
 
 class EDouble extends Double {}
 //                    ^^^^^^
-// [cfe] The class 'Double' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Double' can't be extended outside of its library because it's a final class.
 
 class EVoid extends Void {}
 //                  ^^^^
-// [cfe] The class 'Void' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Void' can't be extended outside of its library because it's a final class.
 
 class ENativeFunction extends NativeFunction {}
 //                            ^^^^^^^^^^^^^^
-// [cfe] The class 'NativeFunction' can't be extended outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'NativeFunction' can't be extended outside of its library because it's a final class.
 
 class EPointer extends Pointer {}
-//                     ^^^^^^^
-// [cfe] The class 'Pointer' can't be extended outside of its library because it's a final class.
-// [analyzer] COMPILE_TIME_ERROR.NO_GENERATIVE_CONSTRUCTORS_IN_SUPERCLASS
 //    ^
-// [cfe] The superclass, 'Pointer', has no unnamed constructor that takes no arguments.
 // [cfe] Subtypes of deeply immutable classes must be deeply immutable.
+// [cfe] The superclass, 'Pointer', has no unnamed constructor that takes no arguments.
+//                     ^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.NO_GENERATIVE_CONSTRUCTORS_IN_SUPERCLASS
+// [cfe] The class 'Pointer' can't be extended outside of its library because it's a final class.
 
 // Cannot implement native natives or Struct.
 
@@ -815,104 +814,104 @@ class EPointer extends Pointer {}
 
 class INativeType implements NativeType {}
 //                           ^^^^^^^^^^
-// [cfe] The class 'NativeType' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'NativeType' can't be implemented outside of its library because it's a final class.
 
 class IInt8 implements Int8 {}
 //                     ^^^^
-// [cfe] The class 'Int8' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Int8' can't be implemented outside of its library because it's a final class.
 
 class IInt16 implements Int16 {}
 //                      ^^^^^
-// [cfe] The class 'Int16' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Int16' can't be implemented outside of its library because it's a final class.
 
 class IInt32 implements Int32 {}
 //                      ^^^^^
-// [cfe] The class 'Int32' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Int32' can't be implemented outside of its library because it's a final class.
 
 class IInt64 implements Int64 {}
 //                      ^^^^^
-// [cfe] The class 'Int64' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Int64' can't be implemented outside of its library because it's a final class.
 
 class IUint8 implements Uint8 {}
 //                      ^^^^^
-// [cfe] The class 'Uint8' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Uint8' can't be implemented outside of its library because it's a final class.
 
 class IUint16 implements Uint16 {}
 //                       ^^^^^^
-// [cfe] The class 'Uint16' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Uint16' can't be implemented outside of its library because it's a final class.
 
 class IUint32 implements Uint32 {}
 //                       ^^^^^^
-// [cfe] The class 'Uint32' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Uint32' can't be implemented outside of its library because it's a final class.
 
 class IUint64 implements Uint64 {}
 //                       ^^^^^^
-// [cfe] The class 'Uint64' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Uint64' can't be implemented outside of its library because it's a final class.
 
 class IIntPtr implements IntPtr {}
+//    ^
+// [cfe] Class 'Object' cannot be extended or implemented.
 //                       ^^^^^^
-// [cfe] The class 'IntPtr' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
 // [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_STRUCT_CLASS
-//    ^
-// [cfe] Class 'Object' cannot be extended or implemented.
+// [cfe] The class 'IntPtr' can't be implemented outside of its library because it's a final class.
 
 class IFloat implements Float {}
 //                      ^^^^^
-// [cfe] The class 'Float' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Float' can't be implemented outside of its library because it's a final class.
 
 class IDouble implements Double {}
 //                       ^^^^^^
-// [cfe] The class 'Double' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Double' can't be implemented outside of its library because it's a final class.
 
 class IVoid implements Void {}
 //                     ^^^^
-// [cfe] The class 'Void' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Void' can't be implemented outside of its library because it's a final class.
 
 class INativeFunction implements NativeFunction {}
 //                               ^^^^^^^^^^^^^^
-// [cfe] The class 'NativeFunction' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'NativeFunction' can't be implemented outside of its library because it's a final class.
 
 class IPointer implements Pointer {}
 //    ^^^^^^^^
-// [cfe] The non-abstract class 'IPointer' is missing implementations for these members:
-// [cfe] Subtypes of deeply immutable classes must be deeply immutable.
 // [analyzer] COMPILE_TIME_ERROR.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER
+// [cfe] Subtypes of deeply immutable classes must be deeply immutable.
+// [cfe] The non-abstract class 'IPointer' is missing implementations for these members:
 //                        ^^^^^^^
-// [cfe] The class 'Pointer' can't be implemented outside of its library because it's a final class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Pointer' can't be implemented outside of its library because it's a final class.
 
 class IStruct implements Struct {}
 //    ^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
 // [cfe] Class 'Object' cannot be extended or implemented.
 // [cfe] The type 'IStruct' must be 'base', 'final' or 'sealed' because the supertype 'Struct' is 'base'.
-// [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
 //                       ^^^^^^
-// [cfe] The class 'Struct' can't be implemented outside of its library because it's a base class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Struct' can't be implemented outside of its library because it's a base class.
 
 class IOpaque implements Opaque {}
 //    ^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
 // [cfe] Class 'Object' cannot be extended or implemented.
 // [cfe] The type 'IOpaque' must be 'base', 'final' or 'sealed' because the supertype 'Opaque' is 'base'.
-// [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
 //                       ^^^^^^
-// [cfe] The class 'Opaque' can't be implemented outside of its library because it's a base class.
 // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+// [cfe] The class 'Opaque' can't be implemented outside of its library because it's a base class.
 
 class MyClass {
   int x;
@@ -958,8 +957,8 @@ final class TestStruct1002 extends Struct {
 
 final class EmptyStruct extends Struct {}
 //          ^^^^^^^^^^^
-// [cfe] Struct 'EmptyStruct' is empty. Empty structs and unions are undefined behavior.
 // [analyzer] COMPILE_TIME_ERROR.EMPTY_STRUCT
+// [cfe] Struct 'EmptyStruct' is empty. Empty structs and unions are undefined behavior.
 
 void testEmptyStructLookupFunctionArgument() {
   testLibrary.lookupFunction<
@@ -1014,7 +1013,7 @@ void testEmptyStructFromFunctionReturn() {
 final class HasNestedEmptyStruct extends Struct {
   external EmptyStruct nestedEmptyStruct;
 //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.EMPTY_STRUCT
+// [analyzer] COMPILE_TIME_ERROR.EMPTY_STRUCT
 
   external Pointer notEmpty;
 }
@@ -1138,8 +1137,8 @@ void testSizeOfGeneric() {
     int size = sizeOf<IntPtr>();
     size = sizeOf<T>();
     //     ^^^^^^^^^^^
-    // [cfe] Expected type 'T' to be a valid and instantiated subtype of 'NativeType'.
     // [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_TYPE_ARGUMENT
+    // [cfe] Expected type 'T' to be a valid and instantiated subtype of 'NativeType'.
     return size;
   }
 
@@ -1149,23 +1148,23 @@ void testSizeOfGeneric() {
 void testSizeOfInvalidType() {
   sizeOf();
 //^^^^^^^^
-  // [cfe] Expected type 'SizedNativeType' to be a valid and instantiated subtype of 'NativeType'.
-  // [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_TYPE_ARGUMENT
+// [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_TYPE_ARGUMENT
+// [cfe] Expected type 'SizedNativeType' to be a valid and instantiated subtype of 'NativeType'.
 
   sizeOf<Struct>();
 //^^^^^^^^^^^^^^^^
-  // [cfe] Expected type 'Struct' to be a valid and instantiated subtype of 'NativeType'.
-  // [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_TYPE_ARGUMENT
+// [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_TYPE_ARGUMENT
+// [cfe] Expected type 'Struct' to be a valid and instantiated subtype of 'NativeType'.
 
   sizeOf<Union>();
 //^^^^^^^^^^^^^^^
-  // [cfe] Expected type 'Union' to be a valid and instantiated subtype of 'NativeType'.
-  // [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_TYPE_ARGUMENT
+// [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_TYPE_ARGUMENT
+// [cfe] Expected type 'Union' to be a valid and instantiated subtype of 'NativeType'.
 
   sizeOf<AbiSpecificInteger>();
 //^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  // [cfe] Expected type 'AbiSpecificInteger' to be a valid and instantiated subtype of 'NativeType'.
-  // [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_TYPE_ARGUMENT
+// [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_TYPE_ARGUMENT
+// [cfe] Expected type 'AbiSpecificInteger' to be a valid and instantiated subtype of 'NativeType'.
 }
 
 
@@ -1173,7 +1172,7 @@ final class TestStruct1400 extends Struct {
   @Array(8)
   @Array(8)
 //^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.EXTRA_SIZE_ANNOTATION_CARRAY
+// [analyzer] COMPILE_TIME_ERROR.EXTRA_SIZE_ANNOTATION_CARRAY
   external Array<Uint8> a0;
   //                    ^
   // [cfe] Field 'a0' must have exactly one 'Array' annotation.
@@ -1181,10 +1180,10 @@ final class TestStruct1400 extends Struct {
 
 final class TestStruct1401 extends Struct {
   external Array<Uint8> a0;
-  //                    ^
-  // [cfe] Field 'a0' must have exactly one 'Array' annotation.
   //       ^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.MISSING_SIZE_ANNOTATION_CARRAY
+  //                    ^
+  // [cfe] Field 'a0' must have exactly one 'Array' annotation.
 
   external Pointer<Uint8> notEmpty;
 }
@@ -1248,10 +1247,10 @@ void testAsFunctionIsLeafMustBeConst() {
   bool notAConst = false;
   Pointer<NativeFunction<Int8UnOp>> p = Pointer.fromAddress(1337);
   IntUnOp f = p.asFunction(isLeaf: notAConst);
-  //                               ^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_MUST_BE_A_CONSTANT
   //            ^
   // [cfe] Argument 'isLeaf' must be a constant.
+  //                               ^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_MUST_BE_A_CONSTANT
 }
 
 typedef NativeTakesHandle = Void Function(Handle);
@@ -1260,10 +1259,10 @@ typedef TakesHandle = void Function(Object);
 void testLookupFunctionTakesHandle() {
   DynamicLibrary l = DynamicLibrary.process();
   l.lookupFunction<NativeTakesHandle, TakesHandle>("takesHandle", isLeaf: true);
-  //               ^^^^^^^^^^^^^^^^^
-  // [analyzer] COMPILE_TIME_ERROR.LEAF_CALL_MUST_NOT_TAKE_HANDLE
   //^
   // [cfe] FFI leaf call must not have Handle argument types.
+  //               ^^^^^^^^^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.LEAF_CALL_MUST_NOT_TAKE_HANDLE
 }
 
 void testAsFunctionTakesHandle() {
@@ -1280,10 +1279,10 @@ typedef ReturnsHandle = Object Function();
 void testLookupFunctionReturnsHandle() {
   DynamicLibrary l = DynamicLibrary.process();
   /**/ l.lookupFunction<NativeReturnsHandle, ReturnsHandle>("returnsHandle",
-      //                ^^^^^^^^^^^^^^^^^^^
-      // [analyzer] COMPILE_TIME_ERROR.LEAF_CALL_MUST_NOT_RETURN_HANDLE
       // ^
       // [cfe] FFI leaf call must not have Handle return type.
+      //                ^^^^^^^^^^^^^^^^^^^
+      // [analyzer] COMPILE_TIME_ERROR.LEAF_CALL_MUST_NOT_RETURN_HANDLE
       isLeaf: true);
 }
 
@@ -1381,9 +1380,9 @@ final class TestStruct1802 extends Struct {
 // [analyzer] COMPILE_TIME_ERROR.ABI_SPECIFIC_INTEGER_MAPPING_EXTRA
 final class AbiSpecificInteger1 extends AbiSpecificInteger {
   //        ^^^^^^^^^^^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.ABI_SPECIFIC_INTEGER_INVALID
   // [cfe] Classes extending 'AbiSpecificInteger' must have exactly one 'AbiSpecificIntegerMapping' annotation specifying the mapping from ABI to a NativeType integer with a fixed size.
   // [cfe] Classes extending 'AbiSpecificInteger' must have exactly one const constructor, no other members, and no type arguments.
-  // [analyzer] COMPILE_TIME_ERROR.ABI_SPECIFIC_INTEGER_INVALID
   const AbiSpecificInteger1();
   //    ^^^^^^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_WITH_NON_FINAL_FIELD
@@ -1397,24 +1396,23 @@ final class AbiSpecificInteger1 extends AbiSpecificInteger {
 
 class AbiSpecificInteger2 implements AbiSpecificInteger {
   //  ^^^^^^^^^^^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
   // [cfe] Class 'Object' cannot be extended or implemented.
   // [cfe] The type 'AbiSpecificInteger2' must be 'base', 'final' or 'sealed' because the supertype 'AbiSpecificInteger' is 'base'.
-  // [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
   //                                 ^^^^^^^^^^^^^^^^^^
-  // [cfe] The class 'AbiSpecificInteger' can't be implemented outside of its library because it's a base class.
   // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+  // [cfe] The class 'AbiSpecificInteger' can't be implemented outside of its library because it's a base class.
   const AbiSpecificInteger2();
 }
 
 class AbiSpecificInteger3 extends AbiSpecificInteger1 {
   //  ^^^^^^^^^^^^^^^^^^^
+  // [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
   // [cfe] Class 'AbiSpecificInteger1' cannot be extended or implemented.
   // [cfe] Classes extending 'AbiSpecificInteger' must have exactly one 'AbiSpecificIntegerMapping' annotation specifying the mapping from ABI to a NativeType integer with a fixed size.
-  // [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
+  // [cfe] The type 'AbiSpecificInteger3' must be 'base', 'final' or 'sealed' because the supertype 'AbiSpecificInteger1' is 'final'.
   //                              ^^^^^^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_STRUCT_CLASS
-  //  ^
-  // [cfe] The type 'AbiSpecificInteger3' must be 'base', 'final' or 'sealed' because the supertype 'AbiSpecificInteger1' is 'final'.
   const AbiSpecificInteger3();
   //    ^^^^^^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_WITH_NON_FINAL_FIELD
@@ -1422,23 +1420,22 @@ class AbiSpecificInteger3 extends AbiSpecificInteger1 {
 
 class AbiSpecificInteger4 implements AbiSpecificInteger1 {
   //  ^^^^^^^^^^^^^^^^^^^
-  // [cfe] Class 'Object' cannot be extended or implemented.
-  // [cfe] The non-abstract class 'AbiSpecificInteger4' is missing implementations for these members:
   // [analyzer] COMPILE_TIME_ERROR.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER
   // [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_BASE_OR_FINAL_IS_NOT_BASE_FINAL_OR_SEALED
+  // [cfe] Class 'Object' cannot be extended or implemented.
+  // [cfe] The non-abstract class 'AbiSpecificInteger4' is missing implementations for these members:
+  // [cfe] The type 'AbiSpecificInteger4' must be 'base', 'final' or 'sealed' because the supertype 'AbiSpecificInteger1' is 'final'.
   //                                 ^^^^^^^^^^^^^^^^^^^
-  // [cfe] The class 'AbiSpecificInteger' can't be implemented outside of its library because it's a base class.
   // [analyzer] COMPILE_TIME_ERROR.INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
   // [analyzer] COMPILE_TIME_ERROR.SUBTYPE_OF_STRUCT_CLASS
-  //  ^
-  // [cfe] The type 'AbiSpecificInteger4' must be 'base', 'final' or 'sealed' because the supertype 'AbiSpecificInteger1' is 'final'.
+  // [cfe] The class 'AbiSpecificInteger' can't be implemented outside of its library because it's a base class.
   const AbiSpecificInteger4();
 }
 
 final class MyFinalizableStruct extends Struct implements Finalizable {
   //        ^^^^^^^^^^^^^^^^^^^
-  // [cfe] Struct 'MyFinalizableStruct' can't implement Finalizable.
   // [analyzer] COMPILE_TIME_ERROR.COMPOUND_IMPLEMENTS_FINALIZABLE
+  // [cfe] Struct 'MyFinalizableStruct' can't implement Finalizable.
   external Pointer<Void> field;
 }
 
diff --git a/tests/language/bool/conditional_expression_condition_context_error_test.dart b/tests/language/bool/conditional_expression_condition_context_error_test.dart
index ade91d554a3..4855b523f21 100644
--- a/tests/language/bool/conditional_expression_condition_context_error_test.dart
+++ b/tests/language/bool/conditional_expression_condition_context_error_test.dart
@@ -8,5 +8,5 @@ main() {
   print((castObject(true)..whatever()) ? 1 : 2);
   //                       ^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'whatever' isn't defined for the class 'bool'.
+  // [cfe] The method 'whatever' isn't defined for the type 'bool'.
 }
diff --git a/tests/language/call/object_has_no_call_method_error_test.dart b/tests/language/call/object_has_no_call_method_error_test.dart
index daa4459cc91..b831b680a1f 100644
--- a/tests/language/call/object_has_no_call_method_error_test.dart
+++ b/tests/language/call/object_has_no_call_method_error_test.dart
@@ -8,19 +8,19 @@ void test(dynamic d, Object o, Function f) {
   // [error column 3, length 1]
   // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
   // [error column 4]
-  // [cfe] The method 'call' isn't defined for the class 'Object'.
+  // [cfe] The method 'call' isn't defined for the type 'Object'.
   f();
   d.call;
   o.call;
   //^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'call' isn't defined for the class 'Object'.
+  // [cfe] The getter 'call' isn't defined for the type 'Object'.
   f.call;
   d.call();
   o.call();
   //^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'call' isn't defined for the class 'Object'.
+  // [cfe] The method 'call' isn't defined for the type 'Object'.
   f.call();
 }
 
diff --git a/tests/language/call/through_getter_test.dart b/tests/language/call/through_getter_test.dart
index a1ba0238266..946799f1fae 100644
--- a/tests/language/call/through_getter_test.dart
+++ b/tests/language/call/through_getter_test.dart
@@ -33,12 +33,12 @@ class CallThroughGetterTest {
     // [error column 5, length 15]
     // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
     //             ^
-    // [cfe] The method 'call' isn't defined for the class 'int'.
+    // [cfe] The method 'call' isn't defined for the type 'int'.
     (TOP_LEVEL_CONST)();
     // [error column 5, length 17]
     // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
     //               ^
-    // [cfe] The method 'call' isn't defined for the class 'int'.
+    // [cfe] The method 'call' isn't defined for the type 'int'.
   }
 
   static void testField() {
diff --git a/tests/language/class/override_inference_error_test.dart b/tests/language/class/override_inference_error_test.dart
index 137c9fb1d03..b597da6de16 100644
--- a/tests/language/class/override_inference_error_test.dart
+++ b/tests/language/class/override_inference_error_test.dart
@@ -125,7 +125,7 @@ class CInherit1 implements IOptx {
     x.arglebargle();
     //^^^^^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-    // [cfe] The method 'arglebargle' isn't defined for the class 'int'.
+    // [cfe] The method 'arglebargle' isn't defined for the type 'int'.
 
     // Return type is exactly int.
     if (x == 0) {
@@ -221,7 +221,7 @@ class CInheritGeneric<S> implements CGeneric<S> {
     x.arglebargle();
     //^^^^^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The method 'arglebargle' isn't defined for the class 'Object?'.
+    // [cfe] The method 'arglebargle' isn't defined for the type 'Object?'.
 
     // Return type is S.
     tmp = foo(x);
@@ -237,7 +237,7 @@ class CInheritGeneric<S> implements CGeneric<S> {
     x.arglebargle();
     //^^^^^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The method 'arglebargle' isn't defined for the class 'Object?'.
+    // [cfe] The method 'arglebargle' isn't defined for the type 'Object?'.
 
     // Return type is Q.
     tmp = bar<Q>(x);
diff --git a/tests/language/class_modifiers/mixin/mixin_class_syntax_error_test.dart b/tests/language/class_modifiers/mixin/mixin_class_syntax_error_test.dart
index 76b4aec6216..3f79bf598ac 100644
--- a/tests/language/class_modifiers/mixin/mixin_class_syntax_error_test.dart
+++ b/tests/language/class_modifiers/mixin/mixin_class_syntax_error_test.dart
@@ -52,7 +52,7 @@ class BaseVariable {
 // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
 // [analyzer] SYNTACTIC_ERROR.EXPECTED_TOKEN
 // [cfe] Expected ';' after this.
-// [cfe] The getter 'mixin' isn't defined for the class 'BaseVariable'.
+// [cfe] The getter 'mixin' isn't defined for the type 'BaseVariable'.
     return x;
   }
 }
diff --git a/tests/language/closure/internals_test.dart b/tests/language/closure/internals_test.dart
index 9efdda3896a..d8c1907e185 100644
--- a/tests/language/closure/internals_test.dart
+++ b/tests/language/closure/internals_test.dart
@@ -13,13 +13,13 @@ main() {
   var target = f.target;
   //             ^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'target' isn't defined for the class 'dynamic Function()'.
+  // [cfe] The getter 'target' isn't defined for the type 'dynamic Function()'.
   var self = f.self;
   //           ^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'self' isn't defined for the class 'dynamic Function()'.
+  // [cfe] The getter 'self' isn't defined for the type 'dynamic Function()'.
   var receiver = f.receiver;
   //               ^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'receiver' isn't defined for the class 'dynamic Function()'.
+  // [cfe] The getter 'receiver' isn't defined for the type 'dynamic Function()'.
 }
diff --git a/tests/language/const_functions/const_functions_instance_fields_error_test.dart b/tests/language/const_functions/const_functions_instance_fields_error_test.dart
index 24e74df1a6f..6f7cff36579 100644
--- a/tests/language/const_functions/const_functions_instance_fields_error_test.dart
+++ b/tests/language/const_functions/const_functions_instance_fields_error_test.dart
@@ -20,7 +20,7 @@ const var1 = fn();
 int fn() => const A(1).x;
 //                     ^
 // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-// [cfe] The getter 'x' isn't defined for the class 'A'.
+// [cfe] The getter 'x' isn't defined for the type 'A'.
 
 const var2 = fn2();
 //           ^^^^^
@@ -30,7 +30,7 @@ int fn2() {
   return x.x;
   //       ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'x' isn't defined for the class 'A'.
+  // [cfe] The getter 'x' isn't defined for the type 'A'.
 }
 
 const var3 = const A(1).x;
@@ -38,4 +38,4 @@ const var3 = const A(1).x;
 // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_PROPERTY_ACCESS
 //                      ^
 // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-// [cfe] The getter 'x' isn't defined for the class 'A'.
+// [cfe] The getter 'x' isn't defined for the type 'A'.
diff --git a/tests/language/const_functions/const_functions_list_error_test.dart b/tests/language/const_functions/const_functions_list_error_test.dart
index fbbdb17b7de..f237b5f85f2 100644
--- a/tests/language/const_functions/const_functions_list_error_test.dart
+++ b/tests/language/const_functions/const_functions_list_error_test.dart
@@ -52,7 +52,7 @@ int invalidPropertyFn() {
   return x.invalidProperty;
   //       ^^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'invalidProperty' isn't defined for the class 'List<int>'.
+  // [cfe] The getter 'invalidProperty' isn't defined for the type 'List<int>'.
 }
 
 const getWithIndexException = getWithIndexExceptionFn();
diff --git a/tests/language/constructor/reference_test.dart b/tests/language/constructor/reference_test.dart
index 06755d18d73..47d5705c6df 100644
--- a/tests/language/constructor/reference_test.dart
+++ b/tests/language/constructor/reference_test.dart
@@ -24,7 +24,7 @@ main() {
   // [cfe] Expected '(' after this.
   //               ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'baz' isn't defined for the class 'Foo<int>'.
+  // [cfe] The method 'baz' isn't defined for the type 'Foo<int>'.
   new Foo.bar<int>();
   //      ^
   // [cfe] A constructor invocation can't have type arguments after the constructor name.
@@ -58,7 +58,7 @@ main() {
   // [cfe] Expected '(' after this.
   //                 ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'baz' isn't defined for the class 'Foo<int>'.
+  // [cfe] The method 'baz' isn't defined for the type 'Foo<int>'.
   const Foo.bar<int>();
   //        ^
   // [cfe] A constructor invocation can't have type arguments after the constructor name.
@@ -82,13 +82,13 @@ main() {
   Foo.bar.baz();
 //        ^^^
 // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-// [cfe] The method 'baz' isn't defined for the class 'Foo<X> Function<X>()'.
+// [cfe] The method 'baz' isn't defined for the type 'Foo<X> Function<X>()'.
   Foo<int>();
   Foo<int>.bar();
   Foo<int>.bar.baz();
   //           ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'baz' isn't defined for the class 'Foo<int> Function()'.
+  // [cfe] The method 'baz' isn't defined for the type 'Foo<int> Function()'.
   Foo.bar<int>();
   //  ^
   // [cfe] A constructor invocation can't have type arguments after the constructor name.
@@ -101,5 +101,5 @@ main() {
   Foo.bar.baz<int>();
 //        ^^^
 // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-// [cfe] The method 'baz' isn't defined for the class 'Foo<X> Function<X>()'.
+// [cfe] The method 'baz' isn't defined for the type 'Foo<X> Function<X>()'.
 }
diff --git a/tests/language/dot_shorthands/simple/call_error_test.dart b/tests/language/dot_shorthands/simple/call_error_test.dart
index fb441f1e7c2..d9bd45ec44d 100644
--- a/tests/language/dot_shorthands/simple/call_error_test.dart
+++ b/tests/language/dot_shorthands/simple/call_error_test.dart
@@ -17,10 +17,10 @@ void main() {
   C c1 = .id1();
   //     ^
   // [analyzer] unspecified
-  // [cfe] The method 'call' isn't defined for the class 'C'.
+  // [cfe] The method 'call' isn't defined for the type 'C'.
 
   C c2 = .id2();
   //     ^
   // [analyzer] unspecified
-  // [cfe] The method 'call' isn't defined for the class 'C'.
+  // [cfe] The method 'call' isn't defined for the type 'C'.
 }
diff --git a/tests/language/dot_shorthands/simple/simple_identifier_error_test.dart b/tests/language/dot_shorthands/simple/simple_identifier_error_test.dart
index d4f149bdeb9..43c114aa5bc 100644
--- a/tests/language/dot_shorthands/simple/simple_identifier_error_test.dart
+++ b/tests/language/dot_shorthands/simple/simple_identifier_error_test.dart
@@ -39,5 +39,5 @@ void main() {
   Integer i = .one();
   //          ^^^^
   // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
-  // [cfe] The method 'call' isn't defined for the class 'Integer'.
+  // [cfe] The method 'call' isn't defined for the type 'Integer'.
 }
diff --git a/tests/language/dynamic/field_test.dart b/tests/language/dynamic/field_test.dart
index c8f73466799..30619693d19 100644
--- a/tests/language/dynamic/field_test.dart
+++ b/tests/language/dynamic/field_test.dart
@@ -16,22 +16,22 @@ class C {
     print(a);
     //    ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'a' isn't defined for the class 'C'.
+    // [cfe] The getter 'a' isn't defined for the type 'C'.
     return a;
     //     ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'a' isn't defined for the class 'C'.
+    // [cfe] The getter 'a' isn't defined for the type 'C'.
   }
 
   bar() {
     print(b.a);
     //    ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'b' isn't defined for the class 'C'.
+    // [cfe] The getter 'b' isn't defined for the type 'C'.
     return b.a;
     //     ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'b' isn't defined for the class 'C'.
+    // [cfe] The getter 'b' isn't defined for the type 'C'.
   }
 }
 
diff --git a/tests/language/extension_methods/static_extension_bounds_error_test.dart b/tests/language/extension_methods/static_extension_bounds_error_test.dart
index e7f8a38fbb1..6759bcf9e52 100644
--- a/tests/language/extension_methods/static_extension_bounds_error_test.dart
+++ b/tests/language/extension_methods/static_extension_bounds_error_test.dart
@@ -33,7 +33,7 @@ void main() {
   s.e1;
   //^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'e1' isn't defined for the class 'String'.
+  // [cfe] The getter 'e1' isn't defined for the type 'String'.
   E1(s).e1;
   // ^
   // [analyzer] COMPILE_TIME_ERROR.EXTENSION_OVERRIDE_ARGUMENT_NOT_ASSIGNABLE
@@ -56,7 +56,7 @@ void main() {
   s.e2;
   //^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'e2' isn't defined for the class 'String'.
+  // [cfe] The getter 'e2' isn't defined for the type 'String'.
   E2(s).e2;
   // [error column 3, length 2]
   // [analyzer] COMPILE_TIME_ERROR.COULD_NOT_INFER
@@ -122,7 +122,7 @@ void main() {
   superRec.e4;
   //       ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'e4' isn't defined for the class 'Rec<dynamic>'.
+  // [cfe] The getter 'e4' isn't defined for the type 'Rec<dynamic>'.
   E4(superRec).e4;
   // [error column 3, length 2]
   // [analyzer] COMPILE_TIME_ERROR.COULD_NOT_INFER
diff --git a/tests/language/extension_methods/static_extension_deferred_import_resolution_error_test.dart b/tests/language/extension_methods/static_extension_deferred_import_resolution_error_test.dart
index 8594b623d00..866fc9cf77b 100644
--- a/tests/language/extension_methods/static_extension_deferred_import_resolution_error_test.dart
+++ b/tests/language/extension_methods/static_extension_deferred_import_resolution_error_test.dart
@@ -15,5 +15,5 @@ void main() {
   o.onObject;
   //^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'onObject' isn't defined for the class 'Object'.
+  // [cfe] The getter 'onObject' isn't defined for the type 'Object'.
 }
diff --git a/tests/language/extension_methods/static_extension_getter_setter_conflicts_test.dart b/tests/language/extension_methods/static_extension_getter_setter_conflicts_test.dart
index 2d89dd0f334..5e2574f0f8e 100644
--- a/tests/language/extension_methods/static_extension_getter_setter_conflicts_test.dart
+++ b/tests/language/extension_methods/static_extension_getter_setter_conflicts_test.dart
@@ -24,7 +24,7 @@ void test0() {
   c0.m1 = 0;
   // ^^
   // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
-  // [cfe] The setter 'm1' isn't defined for the class 'C0'.
+  // [cfe] The setter 'm1' isn't defined for the type 'C0'.
   E0(c0).m1 = 0;
   E0(c0).m1;
   //     ^^
@@ -34,26 +34,26 @@ void test0() {
   c0.m1 += 0;
   // ^^
   // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
-  // [cfe] The setter 'm1' isn't defined for the class 'C0'.
+  // [cfe] The setter 'm1' isn't defined for the type 'C0'.
 
   c0.m1++;
   // ^^
   // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
-  // [cfe] The setter 'm1' isn't defined for the class 'C0'.
+  // [cfe] The setter 'm1' isn't defined for the type 'C0'.
 
   c0.m2 = 0;
   c0.m2;
   // ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'm2' isn't defined for the class 'C0'.
+  // [cfe] The getter 'm2' isn't defined for the type 'C0'.
   c0.m2 += 0;
   // ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'm2' isn't defined for the class 'C0'.
+  // [cfe] The getter 'm2' isn't defined for the type 'C0'.
   c0.m2++;
   // ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'm2' isn't defined for the class 'C0'.
+  // [cfe] The getter 'm2' isn't defined for the type 'C0'.
 
   E0(c0).m2;
 
@@ -61,7 +61,7 @@ void test0() {
   c0[0] = 0;
   //^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]=' isn't defined for the class 'C0'.
+  // [cfe] The operator '[]=' isn't defined for the type 'C0'.
   E0(c0)[0];
   //    ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_EXTENSION_OPERATOR
@@ -71,20 +71,20 @@ void test0() {
   c0[0] += 0;
   //^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]=' isn't defined for the class 'C0'.
+  // [cfe] The operator '[]=' isn't defined for the type 'C0'.
   c0[0]++;
   //^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]=' isn't defined for the class 'C0'.
+  // [cfe] The operator '[]=' isn't defined for the type 'C0'.
 
   E0(c0)[0] += 0;
   //    ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_EXTENSION_OPERATOR
-  // [cfe] The operator '[]' isn't defined for the class 'C0'.
+  // [cfe] The operator '[]' isn't defined for the type 'C0'.
   E0(c0)[0]++;
   //    ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_EXTENSION_OPERATOR
-  // [cfe] The operator '[]' isn't defined for the class 'C0'.
+  // [cfe] The operator '[]' isn't defined for the type 'C0'.
 }
 
 // Conflicting extensions.
@@ -110,29 +110,29 @@ void test1() {
   c1a.m1 = 0;
   //  ^^
   // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
-  // [cfe] The setter 'm1' isn't defined for the class 'C1<int>'.
+  // [cfe] The setter 'm1' isn't defined for the type 'C1<int>'.
 
   c1a.m2;
   //  ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'm2' isn't defined for the class 'C1<int>'.
+  // [cfe] The getter 'm2' isn't defined for the type 'C1<int>'.
 
   c1a.m2 = 0;
 
   c1a[0] = 0;
   // ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]=' isn't defined for the class 'C1<int>'.
+  // [cfe] The operator '[]=' isn't defined for the type 'C1<int>'.
 
   c1a[0] += 0;
   // ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]=' isn't defined for the class 'C1<int>'.
+  // [cfe] The operator '[]=' isn't defined for the type 'C1<int>'.
 
   c1a[0]++;
   // ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]=' isn't defined for the class 'C1<int>'.
+  // [cfe] The operator '[]=' isn't defined for the type 'C1<int>'.
 
   c1a[0];
 
@@ -194,12 +194,12 @@ void test1() {
   c1c.m1 = 0;
   //  ^^
   // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
-  // [cfe] The setter 'm1' isn't defined for the class 'C1<Object>'.
+  // [cfe] The setter 'm1' isn't defined for the type 'C1<Object>'.
 
   c1c.m2;
   //  ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'm2' isn't defined for the class 'C1<Object>'.
+  // [cfe] The getter 'm2' isn't defined for the type 'C1<Object>'.
 }
 
 // Getter on the extension itself.
@@ -223,29 +223,29 @@ extension E2 on C2 {
     this.m1 = 0;
     //   ^^
     // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
-    // [cfe] The setter 'm1' isn't defined for the class 'C2'.
+    // [cfe] The setter 'm1' isn't defined for the type 'C2'.
 
     this.m2 = 0;
     this.m2;
     //   ^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'm2' isn't defined for the class 'C2'.
+    // [cfe] The getter 'm2' isn't defined for the type 'C2'.
 
     this[0] = 0;
     this[0];
     //  ^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-    // [cfe] The operator '[]' isn't defined for the class 'C2'.
+    // [cfe] The operator '[]' isn't defined for the type 'C2'.
 
     this[0] += 0;
     //  ^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-    // [cfe] The operator '[]' isn't defined for the class 'C2'.
+    // [cfe] The operator '[]' isn't defined for the type 'C2'.
 
     this[0]++;
     //  ^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-    // [cfe] The operator '[]' isn't defined for the class 'C2'.
+    // [cfe] The operator '[]' isn't defined for the type 'C2'.
 
     // Check that `this.mc` refers to `C2.mc`.
     this.mc.toRadixString(16);
diff --git a/tests/language/extension_methods/static_extension_import_hide_error_test.dart b/tests/language/extension_methods/static_extension_import_hide_error_test.dart
index 25b0461ac7d..53a18b74b88 100644
--- a/tests/language/extension_methods/static_extension_import_hide_error_test.dart
+++ b/tests/language/extension_methods/static_extension_import_hide_error_test.dart
@@ -13,7 +13,7 @@ void main() {
   i.onInt;
   //^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'onInt' isn't defined for the class 'int'.
+  // [cfe] The getter 'onInt' isn't defined for the type 'int'.
   i.onObject;
   o.onObject;
 }
diff --git a/tests/language/extension_methods/static_extension_import_prefixed_hide_error_test.dart b/tests/language/extension_methods/static_extension_import_prefixed_hide_error_test.dart
index a146f12d75f..598477cf91e 100644
--- a/tests/language/extension_methods/static_extension_import_prefixed_hide_error_test.dart
+++ b/tests/language/extension_methods/static_extension_import_prefixed_hide_error_test.dart
@@ -13,7 +13,7 @@ void main() {
   i.onInt;
   //^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'onInt' isn't defined for the class 'int'.
+  // [cfe] The getter 'onInt' isn't defined for the type 'int'.
   i.onObject;
   o.onObject;
 }
diff --git a/tests/language/extension_methods/static_extension_internal_basename_shadowing_error_test.dart b/tests/language/extension_methods/static_extension_internal_basename_shadowing_error_test.dart
index b2b8347cd90..f865b5b6bff 100644
--- a/tests/language/extension_methods/static_extension_internal_basename_shadowing_error_test.dart
+++ b/tests/language/extension_methods/static_extension_internal_basename_shadowing_error_test.dart
@@ -53,7 +53,7 @@ extension E1 on A1 {
     // [error column 5, length 14]
     // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
     //            ^
-    // [cfe] The method 'call' isn't defined for the class 'int'.
+    // [cfe] The method 'call' isn't defined for the type 'int'.
   }
 }
 
@@ -145,7 +145,7 @@ extension E3 on A3 {
     // [error column 5, length 14]
     // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
     //               ^
-    // [cfe] The method 'call' isn't defined for the class 'int'.
+    // [cfe] The method 'call' isn't defined for the type 'int'.
   }
 }
 
@@ -227,7 +227,7 @@ extension E6 on A6 {
     // [error column 5, length 15]
     // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
     //             ^
-    // [cfe] The method 'call' isn't defined for the class 'int'.
+    // [cfe] The method 'call' isn't defined for the type 'int'.
   }
 }
 
@@ -243,15 +243,15 @@ class A7 extends A6 {
     extensionSetter = extensionSetter + 1;
     // [error column 5, length 15]
     // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
-    // [cfe] The setter 'extensionSetter' isn't defined for the class 'A7'.
+    // [cfe] The setter 'extensionSetter' isn't defined for the type 'A7'.
     extensionSetter++;
     // [error column 5, length 15]
     // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
-    // [cfe] The setter 'extensionSetter' isn't defined for the class 'A7'.
+    // [cfe] The setter 'extensionSetter' isn't defined for the type 'A7'.
     extensionSetter = 0;
     // [error column 5, length 15]
     // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
-    // [cfe] The setter 'extensionSetter' isn't defined for the class 'A7'.
+    // [cfe] The setter 'extensionSetter' isn't defined for the type 'A7'.
 
     // The instance getter shadows the other extensions method
     extensionMethod(4);
@@ -308,21 +308,21 @@ class A9 extends A8 {
     extensionGetter = extensionGetter + 1;
     //                ^^^^^^^^^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'extensionGetter' isn't defined for the class 'A9'.
+    // [cfe] The getter 'extensionGetter' isn't defined for the type 'A9'.
     extensionGetter++;
     // [error column 5, length 15]
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'extensionGetter' isn't defined for the class 'A9'.
+    // [cfe] The getter 'extensionGetter' isn't defined for the type 'A9'.
     extensionGetter;
     // [error column 5, length 15]
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'extensionGetter' isn't defined for the class 'A9'.
+    // [cfe] The getter 'extensionGetter' isn't defined for the type 'A9'.
 
     // The instance setter shadows the other extension's method.
     extensionMethod(4);
     // [error column 5, length 15]
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-    // [cfe] The method 'extensionMethod' isn't defined for the class 'A9'.
+    // [cfe] The method 'extensionMethod' isn't defined for the type 'A9'.
   }
 }
 
@@ -373,7 +373,7 @@ extension E10 on A10 {
     // [error column 5, length 15]
     // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
     //                 ^
-    // [cfe] The method 'call' isn't defined for the class 'int'.
+    // [cfe] The method 'call' isn't defined for the type 'int'.
   }
 }
 
@@ -419,7 +419,7 @@ class A11 extends A10 {
     // [error column 5, length 15]
     // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
     //             ^
-    // [cfe] The method 'call' isn't defined for the class 'int'.
+    // [cfe] The method 'call' isn't defined for the type 'int'.
   }
 }
 
diff --git a/tests/language/extension_methods/static_extension_resolution_failures_test.dart b/tests/language/extension_methods/static_extension_resolution_failures_test.dart
index ce822ac58ad..c3a62386ede 100644
--- a/tests/language/extension_methods/static_extension_resolution_failures_test.dart
+++ b/tests/language/extension_methods/static_extension_resolution_failures_test.dart
@@ -40,7 +40,7 @@ main() {
   i_num.i_num;
   //    ^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'i_num' isn't defined for the class 'Iterable<num>'.
+  // [cfe] The getter 'i_num' isn't defined for the type 'Iterable<num>'.
 
   Expect.equals("Iterable<int>.i_num", ii.i_num);
   Expect.equals("List<num>.i_num", ln.i_num);
diff --git a/tests/language/extension_methods/static_extension_this_not_promoted_error_test.dart b/tests/language/extension_methods/static_extension_this_not_promoted_error_test.dart
index e8db6a3ffb1..abe133966cf 100644
--- a/tests/language/extension_methods/static_extension_this_not_promoted_error_test.dart
+++ b/tests/language/extension_methods/static_extension_this_not_promoted_error_test.dart
@@ -36,11 +36,11 @@ extension on C {
       f(this.dProp);
       //     ^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'dProp' isn't defined for the class 'C'.
+      // [cfe] The getter 'dProp' isn't defined for the type 'C'.
       f(dProp);
       //^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-      // [cfe] The getter 'dProp' isn't defined for the class 'C'.
+      // [cfe] The getter 'dProp' isn't defined for the type 'C'.
     }
   }
 }
diff --git a/tests/language/extension_type/combined_member_signature_error_test.dart b/tests/language/extension_type/combined_member_signature_error_test.dart
index 2cf8d30131e..3808bf819d1 100644
--- a/tests/language/extension_type/combined_member_signature_error_test.dart
+++ b/tests/language/extension_type/combined_member_signature_error_test.dart
@@ -41,12 +41,12 @@ extension type E(C c) implements A, B {}
 testMethod3(E e) => e.method().$1.unresolved();
 //                                ^^^^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-// [cfe] The method 'unresolved' isn't defined for the class 'Object?'.
+// [cfe] The method 'unresolved' isn't defined for the type 'Object?'.
 
 testMethod4(E e) => e.method().$2.unresolved();
 //                                ^^^^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-// [cfe] The method 'unresolved' isn't defined for the class 'Object?'.
+// [cfe] The method 'unresolved' isn't defined for the type 'Object?'.
 
 (Object?, Object?) testGetter0(E e) => e.getter;
 
diff --git a/tests/language/external_abstract_fields/abstract_fields_error_test.dart b/tests/language/external_abstract_fields/abstract_fields_error_test.dart
index 21e881145b8..c9183f0fe57 100644
--- a/tests/language/external_abstract_fields/abstract_fields_error_test.dart
+++ b/tests/language/external_abstract_fields/abstract_fields_error_test.dart
@@ -30,7 +30,7 @@ abstract class Abstract2 {
     a.x = 42;
     //^
     // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL
-    // [cfe] The setter 'x' isn't defined for the class 'Abstract2'.
+    // [cfe] The setter 'x' isn't defined for the type 'Abstract2'.
 
     String y = a.y;
     a.y = "ab";
@@ -49,7 +49,7 @@ abstract class Abstract2 {
     this.x = 42;
     //   ^
     // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL
-    // [cfe] The setter 'x' isn't defined for the class 'Abstract2'.
+    // [cfe] The setter 'x' isn't defined for the type 'Abstract2'.
 
     String y = this.y;
     this.y = "ab";
diff --git a/tests/language/external_abstract_fields/external_fields_error_test.dart b/tests/language/external_abstract_fields/external_fields_error_test.dart
index d866b1d9711..c239be5ee17 100644
--- a/tests/language/external_abstract_fields/external_fields_error_test.dart
+++ b/tests/language/external_abstract_fields/external_fields_error_test.dart
@@ -24,7 +24,7 @@ class External2 {
     a.x = 42;
     //^
     // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL
-    // [cfe] The setter 'x' isn't defined for the class 'External2'.
+    // [cfe] The setter 'x' isn't defined for the type 'External2'.
 
     String y = a.y;
     a.y = "ab";
diff --git a/tests/language/getter/no_setter2_test.dart b/tests/language/getter/no_setter2_test.dart
index 0f4275f389c..7d6c6c25dd2 100644
--- a/tests/language/getter/no_setter2_test.dart
+++ b/tests/language/getter/no_setter2_test.dart
@@ -17,8 +17,8 @@ class Example {
     //   ^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
     // [analyzer] COMPILE_TIME_ERROR.INSTANCE_ACCESS_TO_STATIC_MEMBER
-    // [cfe] The getter 'nextVar' isn't defined for the class 'Example'.
-    // [cfe] The setter 'nextVar' isn't defined for the class 'Example'.
+    // [cfe] The getter 'nextVar' isn't defined for the type 'Example'.
+    // [cfe] The setter 'nextVar' isn't defined for the type 'Example'.
   }
   static test() {
     nextVar++;
diff --git a/tests/language/getter/no_setter_test.dart b/tests/language/getter/no_setter_test.dart
index 60efb53039f..1571ed8998d 100644
--- a/tests/language/getter/no_setter_test.dart
+++ b/tests/language/getter/no_setter_test.dart
@@ -16,7 +16,7 @@ class Example {
     this.nextVar = 1;
     //   ^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_NO_SETTER
-    // [cfe] The setter 'nextVar' isn't defined for the class 'Example'.
+    // [cfe] The setter 'nextVar' isn't defined for the type 'Example'.
   }
   static test() {
     nextVar = 0;
diff --git a/tests/language/getter/setter2_test.dart b/tests/language/getter/setter2_test.dart
index 20568b6ee55..f0ddac7af66 100644
--- a/tests/language/getter/setter2_test.dart
+++ b/tests/language/getter/setter2_test.dart
@@ -80,7 +80,7 @@ main() {
   instance1.field.b();
   //              ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'b' isn't defined for the class 'A'.
+  // [cfe] The method 'b' isn't defined for the type 'A'.
 
   instance3.field = new B();
   result = instance3.field.a();
diff --git a/tests/language/getter/unbound_test.dart b/tests/language/getter/unbound_test.dart
index 23adf3af775..617a7698636 100644
--- a/tests/language/getter/unbound_test.dart
+++ b/tests/language/getter/unbound_test.dart
@@ -9,7 +9,7 @@ class A {
     return y;
     //     ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'y' isn't defined for the class 'A'.
+    // [cfe] The getter 'y' isn't defined for the type 'A'.
   }
 }
 
diff --git a/tests/language/if_null/assignment_behavior_test.dart b/tests/language/if_null/assignment_behavior_test.dart
index 7333b3fc645..a313dc7f8b9 100644
--- a/tests/language/if_null/assignment_behavior_test.dart
+++ b/tests/language/if_null/assignment_behavior_test.dart
@@ -125,7 +125,7 @@ class C {
     finalOne ??= null;
     // [error column 5, length 8]
     // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL
-    // [cfe] The setter 'finalOne' isn't defined for the class 'C'.
+    // [cfe] The setter 'finalOne' isn't defined for the type 'C'.
     //           ^^^^
     // [analyzer] STATIC_WARNING.DEAD_NULL_AWARE_EXPRESSION
     yGetValue = 1;
diff --git a/tests/language/is/is_never_does_not_promote_error_test.dart b/tests/language/is/is_never_does_not_promote_error_test.dart
index 28ec25b92af..75764e46704 100644
--- a/tests/language/is/is_never_does_not_promote_error_test.dart
+++ b/tests/language/is/is_never_does_not_promote_error_test.dart
@@ -14,7 +14,7 @@ void f(int i) {
     i.bogus();
     //^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-    // [cfe] The method 'bogus' isn't defined for the class 'int'.
+    // [cfe] The method 'bogus' isn't defined for the type 'int'.
   }
 }
 
diff --git a/tests/language/least_upper_bound/expansive_test.dart b/tests/language/least_upper_bound/expansive_test.dart
index 78276e50c62..e3d0911497a 100644
--- a/tests/language/least_upper_bound/expansive_test.dart
+++ b/tests/language/least_upper_bound/expansive_test.dart
@@ -43,37 +43,37 @@ void testC1(bool z, C1<int> a, N<C1<String>> b) {
     (z ? a : b).z;
     //          ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'z' isn't defined for the class 'Object'.
+    // [cfe] The getter 'z' isn't defined for the type 'Object'.
 
     // Is least upper bound N<...> ?
     (z ? a : b).n;
     //          ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'n' isn't defined for the class 'Object'.
+    // [cfe] The getter 'n' isn't defined for the type 'Object'.
 
     // Is least upper bound C1<...> ?
     (z ? a : b).c1;
     //          ^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c1' isn't defined for the class 'Object'.
+    // [cfe] The getter 'c1' isn't defined for the type 'Object'.
 
     // Is least upper bound N<dynamic> ?
     (z ? a : b).n.z;
     //          ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'n' isn't defined for the class 'Object'.
+    // [cfe] The getter 'n' isn't defined for the type 'Object'.
 
     // Is least upper bound N<N<...>> ?
     (z ? a : b).n.n;
     //          ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'n' isn't defined for the class 'Object'.
+    // [cfe] The getter 'n' isn't defined for the type 'Object'.
 
     // Is least upper bound N<C1<...>> ?
     (z ? a : b).n.c1;
     //          ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'n' isn't defined for the class 'Object'.
+    // [cfe] The getter 'n' isn't defined for the type 'Object'.
   }
 }
 
@@ -107,37 +107,37 @@ void testC2(bool z, C2<int> a, N<C2<String>> b) {
     (z ? a : b).z;
     //          ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'z' isn't defined for the class 'Object'.
+    // [cfe] The getter 'z' isn't defined for the type 'Object'.
 
     // Is least upper bound N<...> ?
     (z ? a : b).n;
     //          ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'n' isn't defined for the class 'Object'.
+    // [cfe] The getter 'n' isn't defined for the type 'Object'.
 
     // Is least upper bound C2<...> ?
     (z ? a : b).c2;
     //          ^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c2' isn't defined for the class 'Object'.
+    // [cfe] The getter 'c2' isn't defined for the type 'Object'.
 
     // Is least upper bound N<dynamic> ?
     (z ? a : b).n.z;
     //          ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'n' isn't defined for the class 'Object'.
+    // [cfe] The getter 'n' isn't defined for the type 'Object'.
 
     // Is least upper bound N<N<...>> ?
     (z ? a : b).n.n;
     //          ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'n' isn't defined for the class 'Object'.
+    // [cfe] The getter 'n' isn't defined for the type 'Object'.
 
     // Is least upper bound N<C2<...>> ?
     (z ? a : b).n.c2;
     //          ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'n' isn't defined for the class 'Object'.
+    // [cfe] The getter 'n' isn't defined for the type 'Object'.
   }
 }
 
diff --git a/tests/language/least_upper_bound/least_upper_bound_fbound_test.dart b/tests/language/least_upper_bound/least_upper_bound_fbound_test.dart
index 1c993827134..fdac3ba34b1 100644
--- a/tests/language/least_upper_bound/least_upper_bound_fbound_test.dart
+++ b/tests/language/least_upper_bound/least_upper_bound_fbound_test.dart
@@ -28,11 +28,11 @@ class A<X extends A<X, X>?, Y extends A<Y, Y>?> {
     zx?.whatever;
     //  ^^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'whatever' isn't defined for the class 'Object'.
+    // [cfe] The getter 'whatever' isn't defined for the type 'Object'.
     zy?.whatever;
     //  ^^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'whatever' isn't defined for the class 'Object'.
+    // [cfe] The getter 'whatever' isn't defined for the type 'Object'.
 
     if (zx == null || zy == null) throw 0;
     zx.expectStaticType<Exactly<Object>>();
diff --git a/tests/language/least_upper_bound/least_upper_bound_test.dart b/tests/language/least_upper_bound/least_upper_bound_test.dart
index dd916377068..ed98877d49e 100644
--- a/tests/language/least_upper_bound/least_upper_bound_test.dart
+++ b/tests/language/least_upper_bound/least_upper_bound_test.dart
@@ -54,11 +54,11 @@ void testAB(A a, B b) {
   (true ? a : b).a = 0;
   //             ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
-  // [cfe] The setter 'a' isn't defined for the class 'Object'.
+  // [cfe] The setter 'a' isn't defined for the type 'Object'.
   (false ? a : b).b = 0;
   //              ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
-  // [cfe] The setter 'b' isn't defined for the class 'Object'.
+  // [cfe] The setter 'b' isn't defined for the type 'Object'.
   var c = new C();
   (true ? a as dynamic : c).a = 0;
   (false ? c : b).b = 0;
@@ -75,7 +75,7 @@ void testBC(B b, C c) {
   (false ? b : c).c = 0;
   //              ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
-  // [cfe] The setter 'c' isn't defined for the class 'B'.
+  // [cfe] The setter 'c' isn't defined for the type 'B'.
   var a = null;
   (true ? b : a).b = 0;
   (false ? a : b).c = 0;
@@ -99,11 +99,11 @@ void testCD(C c, D d) {
   (true ? c : d).c = 0;
   //             ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
-  // [cfe] The setter 'c' isn't defined for the class 'B'.
+  // [cfe] The setter 'c' isn't defined for the type 'B'.
   (false ? c : d).d = 0;
   //              ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
-  // [cfe] The setter 'd' isn't defined for the class 'B'.
+  // [cfe] The setter 'd' isn't defined for the type 'B'.
 }
 
 void testEE(E<B> e, E<C> f) {
@@ -151,5 +151,5 @@ void testEF(E<B> e, F<C> f) {
   r5 = (false ? e : f).f;
   //                   ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'f' isn't defined for the class 'E<B>'.
+  // [cfe] The getter 'f' isn't defined for the type 'E<B>'.
 }
diff --git a/tests/language/nnbd/flow_analysis/unreachable_via_getter_get_error_test.dart b/tests/language/nnbd/flow_analysis/unreachable_via_getter_get_error_test.dart
index 55ecb7b5ce4..05c0aefc008 100644
--- a/tests/language/nnbd/flow_analysis/unreachable_via_getter_get_error_test.dart
+++ b/tests/language/nnbd/flow_analysis/unreachable_via_getter_get_error_test.dart
@@ -20,7 +20,7 @@ void explicitNeverQuestionType(Object x, bool b) {
   x.isEven;
   //^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+  // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
 }
 
 main() {
diff --git a/tests/language/nnbd/flow_analysis/unreachable_via_invocation_error_test.dart b/tests/language/nnbd/flow_analysis/unreachable_via_invocation_error_test.dart
index cb613afa08e..258824ba96e 100644
--- a/tests/language/nnbd/flow_analysis/unreachable_via_invocation_error_test.dart
+++ b/tests/language/nnbd/flow_analysis/unreachable_via_invocation_error_test.dart
@@ -20,7 +20,7 @@ void explicitNeverQuestionType(Object x, bool b) {
   x.isEven;
   //^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+  // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
 }
 
 main() {
diff --git a/tests/language/nnbd/flow_analysis/unreachable_via_promotion_error_test.dart b/tests/language/nnbd/flow_analysis/unreachable_via_promotion_error_test.dart
index d19446ddbaf..d1455efc3b7 100644
--- a/tests/language/nnbd/flow_analysis/unreachable_via_promotion_error_test.dart
+++ b/tests/language/nnbd/flow_analysis/unreachable_via_promotion_error_test.dart
@@ -18,7 +18,7 @@ void promoteViaIsCheck(Object x, Object? y) {
   x.isEven;
   //^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+  // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
 }
 
 main() {
diff --git a/tests/language/nnbd/flow_analysis/unreachable_via_variable_get_error_test.dart b/tests/language/nnbd/flow_analysis/unreachable_via_variable_get_error_test.dart
index 964d2f06e02..85e8889969a 100644
--- a/tests/language/nnbd/flow_analysis/unreachable_via_variable_get_error_test.dart
+++ b/tests/language/nnbd/flow_analysis/unreachable_via_variable_get_error_test.dart
@@ -18,7 +18,7 @@ void explicitNeverQuestionType(Object x, bool b) {
   x.isEven;
   //^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+  // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
 }
 
 main() {
diff --git a/tests/language/nnbd/flow_analysis/write_promoted_value_in_closure_error_test.dart b/tests/language/nnbd/flow_analysis/write_promoted_value_in_closure_error_test.dart
index 7fd85a582c8..1df7e390fe8 100644
--- a/tests/language/nnbd/flow_analysis/write_promoted_value_in_closure_error_test.dart
+++ b/tests/language/nnbd/flow_analysis/write_promoted_value_in_closure_error_test.dart
@@ -16,7 +16,7 @@ void functionExpression(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
       x = 0;
     };
   }
@@ -32,7 +32,7 @@ void localFunction(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
       x = 0;
     }
   }
diff --git a/tests/language/nnbd/flow_analysis/write_promoted_value_in_loop_error_test.dart b/tests/language/nnbd/flow_analysis/write_promoted_value_in_loop_error_test.dart
index 8436146abfa..10f4db98473 100644
--- a/tests/language/nnbd/flow_analysis/write_promoted_value_in_loop_error_test.dart
+++ b/tests/language/nnbd/flow_analysis/write_promoted_value_in_loop_error_test.dart
@@ -15,7 +15,7 @@ void forLoopAssignInCondition(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
     }
   }
 }
@@ -30,7 +30,7 @@ void forLoopAssignInUpdater(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
     }
   }
 }
@@ -45,7 +45,7 @@ void forLoopAssignInBody(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
       x = 0;
     }
   }
@@ -61,7 +61,7 @@ void forEachAssignInBody(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
       x = 0;
     }
   }
@@ -77,7 +77,7 @@ void whileAssignInCondition(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
     }
   }
 }
@@ -92,7 +92,7 @@ void whileAssignInBody(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
       x = 0;
     }
   }
@@ -108,7 +108,7 @@ void doAssignInCondition(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
     } while ((x = 0) == 0);
   }
 }
@@ -123,7 +123,7 @@ void doAssignInBody(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
       x = 0;
     } while (true);
   }
diff --git a/tests/language/nnbd/flow_analysis/write_promoted_value_in_switch_error_test.dart b/tests/language/nnbd/flow_analysis/write_promoted_value_in_switch_error_test.dart
index ee60537f9ba..302ba68d6d5 100644
--- a/tests/language/nnbd/flow_analysis/write_promoted_value_in_switch_error_test.dart
+++ b/tests/language/nnbd/flow_analysis/write_promoted_value_in_switch_error_test.dart
@@ -20,7 +20,7 @@ void switchWithLabelAssignInCase(Object x) {
         print(x.isEven);
         //      ^^^^^^
         // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-        // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+        // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
         x = 0;
         break;
     }
@@ -41,7 +41,7 @@ void switchWithLabelAssignInDefault(Object x) {
         print(x.isEven);
         //      ^^^^^^
         // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-        // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+        // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
         x = 0;
         break;
     }
diff --git a/tests/language/nnbd/flow_analysis/write_promoted_value_in_try_error_test.dart b/tests/language/nnbd/flow_analysis/write_promoted_value_in_try_error_test.dart
index 6368e1d6913..fce5e941731 100644
--- a/tests/language/nnbd/flow_analysis/write_promoted_value_in_try_error_test.dart
+++ b/tests/language/nnbd/flow_analysis/write_promoted_value_in_try_error_test.dart
@@ -19,7 +19,7 @@ void tryCatchAssignInBody(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
     }
   }
 }
@@ -37,7 +37,7 @@ void tryFinallyAssignInBody(Object x) {
       print(x.isEven);
       //      ^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'isEven' isn't defined for the class 'Object'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'Object'.
     }
   }
 }
diff --git a/tests/language/nnbd/top_merge/top_merge_interfaces_direct_error_test.dart b/tests/language/nnbd/top_merge/top_merge_interfaces_direct_error_test.dart
index 76518ee10ef..17c05cb7523 100644
--- a/tests/language/nnbd/top_merge/top_merge_interfaces_direct_error_test.dart
+++ b/tests/language/nnbd/top_merge/top_merge_interfaces_direct_error_test.dart
@@ -20,7 +20,7 @@ class D0 extends A<dynamic> implements B<Object?> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -35,7 +35,7 @@ class D1 extends A<Object?> implements B<dynamic> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -50,7 +50,7 @@ class D2 extends A<void> implements B<Object?> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -65,7 +65,7 @@ class D3 extends A<Object?> implements B<void> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -80,7 +80,7 @@ class D4 extends A<void> implements B<dynamic> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -95,7 +95,7 @@ class D5 extends A<dynamic> implements B<void> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -112,7 +112,7 @@ class D6 extends A<void> implements B<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that we do not implement A<Object?>
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -140,7 +140,7 @@ class ND0 extends A<FutureOr<dynamic>> implements B<Object?> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -155,7 +155,7 @@ class ND1 extends A<FutureOr<Object?>> implements B<dynamic> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -170,7 +170,7 @@ class ND2 extends A<FutureOr<void>> implements B<Object?> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -185,7 +185,7 @@ class ND3 extends A<FutureOr<Object?>> implements B<void> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -200,7 +200,7 @@ class ND4 extends A<FutureOr<void>> implements B<dynamic> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -215,7 +215,7 @@ class ND5 extends A<FutureOr<dynamic>> implements B<void> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -232,7 +232,7 @@ class ND6 extends A<FutureOr<void>> implements B<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that we do not implement A<Object?>
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -261,7 +261,7 @@ class DND0 extends A<FutureOr<dynamic> Function()>
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -277,7 +277,7 @@ class DND1 extends A<FutureOr<Object?> Function()>
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -293,7 +293,7 @@ class DND2 extends A<FutureOr<void> Function()>
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -309,7 +309,7 @@ class DND3 extends A<FutureOr<Object?> Function()>
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -325,7 +325,7 @@ class DND4 extends A<FutureOr<void> Function()>
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -341,7 +341,7 @@ class DND5 extends A<FutureOr<dynamic> Function()>
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -358,7 +358,7 @@ class DND6 extends A<FutureOr<void> Function()> implements B<void Function()> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that we do not implement A<Object? Function()>
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -389,7 +389,7 @@ class WND0 extends A<Wrap<FutureOr<dynamic>>> implements B<Wrap<Object?>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -404,7 +404,7 @@ class WND1 extends A<Wrap<FutureOr<Object?>>> implements B<Wrap<dynamic>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -419,7 +419,7 @@ class WND2 extends A<Wrap<FutureOr<void>>> implements B<Wrap<Object?>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -434,7 +434,7 @@ class WND3 extends A<Wrap<FutureOr<Object?>>> implements B<Wrap<void>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -449,7 +449,7 @@ class WND4 extends A<Wrap<FutureOr<void>>> implements B<Wrap<dynamic>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -464,7 +464,7 @@ class WND5 extends A<Wrap<FutureOr<dynamic>>> implements B<Wrap<void>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -481,7 +481,7 @@ class WND6 extends A<Wrap<FutureOr<void>>> implements B<Wrap<void>> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that we do not implement A<Object? Function()>
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
diff --git a/tests/language/nnbd/top_merge/top_merge_interfaces_mixin_error_test.dart b/tests/language/nnbd/top_merge/top_merge_interfaces_mixin_error_test.dart
index d9bd4cd9cc7..4539d64d2cf 100644
--- a/tests/language/nnbd/top_merge/top_merge_interfaces_mixin_error_test.dart
+++ b/tests/language/nnbd/top_merge/top_merge_interfaces_mixin_error_test.dart
@@ -20,7 +20,7 @@ class D0 extends A<dynamic> with M<Object?> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -35,7 +35,7 @@ class D1 extends A<Object?> with M<dynamic> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -50,7 +50,7 @@ class D2 extends A<void> with M<Object?> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -65,7 +65,7 @@ class D3 extends A<Object?> with M<void> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -80,7 +80,7 @@ class D4 extends A<void> with M<dynamic> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -95,7 +95,7 @@ class D5 extends A<dynamic> with M<void> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -112,7 +112,7 @@ class D6 extends A<void> with M<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that we do not implement A<Object?>
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -140,7 +140,7 @@ class ND0 extends A<FutureOr<dynamic>> with M<Object?> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -155,7 +155,7 @@ class ND1 extends A<FutureOr<Object?>> with M<dynamic> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -170,7 +170,7 @@ class ND2 extends A<FutureOr<void>> with M<Object?> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -185,7 +185,7 @@ class ND3 extends A<FutureOr<Object?>> with M<void> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -200,7 +200,7 @@ class ND4 extends A<FutureOr<void>> with M<dynamic> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -215,7 +215,7 @@ class ND5 extends A<FutureOr<dynamic>> with M<void> {
     x.foo; // Check that we do not implement A<dynamic>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void>
     takesObject(x); // Check that we do not implement A<Object>
     //          ^
@@ -232,7 +232,7 @@ class ND6 extends A<FutureOr<void>> with M<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that we do not implement A<Object?>
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -260,7 +260,7 @@ class DND0 extends A<FutureOr<dynamic> Function()> with M<Object? Function()> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -275,7 +275,7 @@ class DND1 extends A<FutureOr<Object?> Function()> with M<dynamic Function()> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -290,7 +290,7 @@ class DND2 extends A<FutureOr<void> Function()> with M<Object? Function()> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -305,7 +305,7 @@ class DND3 extends A<FutureOr<Object?> Function()> with M<void Function()> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -320,7 +320,7 @@ class DND4 extends A<FutureOr<void> Function()> with M<dynamic Function()> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -335,7 +335,7 @@ class DND5 extends A<FutureOr<dynamic> Function()> with M<void Function()> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -352,7 +352,7 @@ class DND6 extends A<FutureOr<void> Function()> with M<void Function()> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that we do not implement A<Object? Function()>
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -382,7 +382,7 @@ class WND0 extends A<Wrap<FutureOr<dynamic>>> with M<Wrap<Object?>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -397,7 +397,7 @@ class WND1 extends A<Wrap<FutureOr<Object?>>> with M<Wrap<dynamic>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -412,7 +412,7 @@ class WND2 extends A<Wrap<FutureOr<void>>> with M<Wrap<Object?>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -427,7 +427,7 @@ class WND3 extends A<Wrap<FutureOr<Object?>>> with M<Wrap<void>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -442,7 +442,7 @@ class WND4 extends A<Wrap<FutureOr<void>>> with M<Wrap<dynamic>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -457,7 +457,7 @@ class WND5 extends A<Wrap<FutureOr<dynamic>>> with M<Wrap<void>> {
     x.foo; // Check that we do not implement A<dynamic Function()>
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that we do not implement A<void Function()>
     takesObject(x); // Check that we do not implement A<Object Function()>
     //          ^
@@ -474,7 +474,7 @@ class WND6 extends A<Wrap<FutureOr<void>>> with M<Wrap<void>> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that we do not implement A<Object? Function()>
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
diff --git a/tests/language/nnbd/top_merge/top_merge_members_direct_error_test.dart b/tests/language/nnbd/top_merge/top_merge_members_direct_error_test.dart
index 8f10be507c2..55194132fde 100644
--- a/tests/language/nnbd/top_merge/top_merge_members_direct_error_test.dart
+++ b/tests/language/nnbd/top_merge/top_merge_members_direct_error_test.dart
@@ -27,7 +27,7 @@ class D0 extends A<dynamic> implements B<Object?> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -43,7 +43,7 @@ class D1 extends A<Object?> implements B<dynamic> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -59,7 +59,7 @@ class D2 extends A<void> implements B<Object?> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -75,7 +75,7 @@ class D3 extends A<Object?> implements B<void> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -91,7 +91,7 @@ class D4 extends A<void> implements B<dynamic> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -107,7 +107,7 @@ class D5 extends A<dynamic> implements B<void> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -125,7 +125,7 @@ class D6 extends A<void> implements B<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return Object?
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -155,7 +155,7 @@ class ND0 extends A<FutureOr<dynamic>> implements B<Object?> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -171,7 +171,7 @@ class ND1 extends A<FutureOr<Object?>> implements B<dynamic> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -187,7 +187,7 @@ class ND2 extends A<FutureOr<void>> implements B<Object?> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -203,7 +203,7 @@ class ND3 extends A<FutureOr<Object?>> implements B<void> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -219,7 +219,7 @@ class ND4 extends A<FutureOr<void>> implements B<dynamic> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -235,7 +235,7 @@ class ND5 extends A<FutureOr<dynamic>> implements B<void> {
     x.foo; // Check that member does not return dynamic
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void
     takesObject(x); // Check that member does not return Object
     //          ^
@@ -253,7 +253,7 @@ class ND6 extends A<FutureOr<void>> implements B<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return Object?
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -284,7 +284,7 @@ class DND0 extends A<FutureOr<dynamic> Function()>
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -301,7 +301,7 @@ class DND1 extends A<FutureOr<Object?> Function()>
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -318,7 +318,7 @@ class DND2 extends A<FutureOr<void> Function()>
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -335,7 +335,7 @@ class DND3 extends A<FutureOr<Object?> Function()>
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -352,7 +352,7 @@ class DND4 extends A<FutureOr<void> Function()>
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -369,7 +369,7 @@ class DND5 extends A<FutureOr<dynamic> Function()>
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -387,7 +387,7 @@ class DND6 extends A<FutureOr<void> Function()> implements B<void Function()> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return Object? Function()
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -420,7 +420,7 @@ class WND0 extends A<Wrap<FutureOr<dynamic>>> implements B<Wrap<Object?>> {
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -436,7 +436,7 @@ class WND1 extends A<Wrap<FutureOr<Object?>>> implements B<Wrap<dynamic>> {
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -452,7 +452,7 @@ class WND2 extends A<Wrap<FutureOr<void>>> implements B<Wrap<Object?>> {
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -468,7 +468,7 @@ class WND3 extends A<Wrap<FutureOr<Object?>>> implements B<Wrap<void>> {
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -484,7 +484,7 @@ class WND4 extends A<Wrap<FutureOr<void>>> implements B<Wrap<dynamic>> {
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -500,7 +500,7 @@ class WND5 extends A<Wrap<FutureOr<dynamic>>> implements B<Wrap<void>> {
     x.foo; // Check that member does not return dynamic Function()
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return void Function()
     takesObject(x); // Check that member does not return Object Function()
     //          ^
@@ -518,7 +518,7 @@ class WND6 extends A<Wrap<FutureOr<void>>> implements B<Wrap<void>> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return Object? Function()
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
diff --git a/tests/language/nnbd/top_merge/top_merge_members_mixin_error_test.dart b/tests/language/nnbd/top_merge/top_merge_members_mixin_error_test.dart
index c2b72fbf996..071c59c8e6c 100644
--- a/tests/language/nnbd/top_merge/top_merge_members_mixin_error_test.dart
+++ b/tests/language/nnbd/top_merge/top_merge_members_mixin_error_test.dart
@@ -29,7 +29,7 @@ class D0 extends A<dynamic> with M<Object?> {
     x.foo; // Check that member does not return `dynamic`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void`
     takesObject(x); // Check that member does not return `Object`
     //          ^
@@ -53,7 +53,7 @@ class D2 extends A<void> with M<Object?> {
     x.foo; // Check that member does not return `dynamic`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void`
     takesObject(x); // Check that member does not return `Object`
     //          ^
@@ -71,7 +71,7 @@ class D3 extends A<Object?> with M<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -101,7 +101,7 @@ class D5 extends A<dynamic> with M<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -123,7 +123,7 @@ class D6 extends A<void> with M<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -154,7 +154,7 @@ class ND0 extends A<FutureOr<dynamic>> with M<Object?> {
     x.foo; // Check that member does not return `dynamic`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void`
     takesObject(x); // Check that member does not return `Object`
     //          ^
@@ -178,7 +178,7 @@ class ND2 extends A<FutureOr<void>> with M<Object?> {
     x.foo; // Check that member does not return `dynamic`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void`
     takesObject(x); // Check that member does not return `Object`
     //          ^
@@ -196,7 +196,7 @@ class ND3 extends A<FutureOr<Object?>> with M<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -226,7 +226,7 @@ class ND5 extends A<FutureOr<dynamic>> with M<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -248,7 +248,7 @@ class ND6 extends A<FutureOr<void>> with M<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -278,7 +278,7 @@ class DND0 extends A<FutureOr<dynamic> Function()> with M<Object? Function()> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -302,7 +302,7 @@ class DND2 extends A<FutureOr<void> Function()> with M<Object? Function()> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -320,7 +320,7 @@ class DND3 extends A<FutureOr<Object?> Function()> with M<void Function()> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object? Function()`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -350,7 +350,7 @@ class DND5 extends A<FutureOr<dynamic> Function()> with M<void Function()> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object? Function()`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -372,7 +372,7 @@ class DND6 extends A<FutureOr<void> Function()> with M<void Function()> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object? Function()`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -409,7 +409,7 @@ class WND0 extends A<Wrap<FutureOr<dynamic>>> with M<Wrap<Object?>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<Object?>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<Object?>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -425,7 +425,7 @@ class WND1 extends A<Wrap<FutureOr<Object?>>> with M<Wrap<dynamic>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<dynamic>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<dynamic>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -441,7 +441,7 @@ class WND2 extends A<Wrap<FutureOr<void>>> with M<Wrap<Object?>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<Object?>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<Object?>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -457,7 +457,7 @@ class WND3 extends A<Wrap<FutureOr<Object?>>> with M<Wrap<void>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<void>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<void>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -473,7 +473,7 @@ class WND4 extends A<Wrap<FutureOr<void>>> with M<Wrap<dynamic>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<dynamic>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<dynamic>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -489,7 +489,7 @@ class WND5 extends A<Wrap<FutureOr<dynamic>>> with M<Wrap<void>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<void>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<void>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -505,7 +505,7 @@ class WND6 extends A<Wrap<FutureOr<void>>> with M<Wrap<void>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<void>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<void>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -521,7 +521,7 @@ class WND7 extends A<Wrap<FutureOr<dynamic>>> with M<Wrap<dynamic>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<dynamic>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<dynamic>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
diff --git a/tests/language/nnbd/top_merge/top_merge_members_override_error_test.dart b/tests/language/nnbd/top_merge/top_merge_members_override_error_test.dart
index d26170dab0f..97c80e569a5 100644
--- a/tests/language/nnbd/top_merge/top_merge_members_override_error_test.dart
+++ b/tests/language/nnbd/top_merge/top_merge_members_override_error_test.dart
@@ -27,7 +27,7 @@ class D0 extends A<dynamic> {
     x.foo; // Check that member does not return `dynamic`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void`
     takesObject(x); // Check that member does not return `Object`
     //          ^
@@ -59,7 +59,7 @@ class D2 extends A<void> {
     x.foo; // Check that member does not return `dynamic`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void`
     takesObject(x); // Check that member does not return `Object`
     //          ^
@@ -81,7 +81,7 @@ class D3 extends A<Object?> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -119,7 +119,7 @@ class D5 extends A<dynamic> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -145,7 +145,7 @@ class D6 extends A<void> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -184,7 +184,7 @@ class ND0 extends A<FutureOr<dynamic>> {
     x.foo; // Check that member does not return `dynamic`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void`
     takesObject(x); // Check that member does not return `Object`
     //          ^
@@ -216,7 +216,7 @@ class ND2 extends A<FutureOr<void>> {
     x.foo; // Check that member does not return `dynamic`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void`
     takesObject(x); // Check that member does not return `Object`
     //          ^
@@ -238,7 +238,7 @@ class ND3 extends A<FutureOr<Object?>> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -276,7 +276,7 @@ class ND5 extends A<FutureOr<dynamic>> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -302,7 +302,7 @@ class ND6 extends A<FutureOr<void>> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object?`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -340,7 +340,7 @@ class DND0 extends A<FutureOr<dynamic> Function()> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -372,7 +372,7 @@ class DND2 extends A<FutureOr<void> Function()> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'Object?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'Object?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -394,7 +394,7 @@ class DND3 extends A<FutureOr<Object?> Function()> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object? Function()`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -432,7 +432,7 @@ class DND5 extends A<FutureOr<dynamic> Function()> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object? Function()`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -458,7 +458,7 @@ class DND6 extends A<FutureOr<void> Function()> {
     // [cfe] This expression has type 'void' and can't be used.
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-    // [cfe] The getter 'foo' isn't defined for the class 'void'.
+    // [cfe] The getter 'foo' isn't defined for the type 'void'.
     x.toString; // Check that member does not return `Object? Function()`
     // [error column 5]
     // [cfe] This expression has type 'void' and can't be used.
@@ -503,7 +503,7 @@ class WND0 extends A<Wrap<FutureOr<dynamic>>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<FutureOr<Object?>>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<FutureOr<Object?>>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -523,7 +523,7 @@ class WND1 extends A<Wrap<FutureOr<Object?>>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<dynamic>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<dynamic>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -543,7 +543,7 @@ class WND2 extends A<Wrap<FutureOr<void>>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<Object?>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<Object?>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -563,7 +563,7 @@ class WND3 extends A<Wrap<FutureOr<Object?>>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<void>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<void>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -583,7 +583,7 @@ class WND4 extends A<Wrap<FutureOr<void>>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<dynamic>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<dynamic>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -603,7 +603,7 @@ class WND5 extends A<Wrap<FutureOr<dynamic>>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<void>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<void>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -623,7 +623,7 @@ class WND6 extends A<Wrap<FutureOr<void>>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<void>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<void>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
@@ -643,7 +643,7 @@ class WND7 extends A<Wrap<FutureOr<dynamic>>> {
     x.foo; // Check that member does not return `dynamic Function()`
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-    // [cfe] The getter 'foo' isn't defined for the class 'FutureOr<dynamic>?'.
+    // [cfe] The getter 'foo' isn't defined for the type 'FutureOr<dynamic>?'.
     x.toString; // Check that member does not return `void Function()`
     takesObject(x); // Check that member does not return `Object Function()`
     //          ^
diff --git a/tests/language/nnbd/try_catch/default_catch_type_error_test.dart b/tests/language/nnbd/try_catch/default_catch_type_error_test.dart
index 03017a6a43b..6ff5d96ed8d 100644
--- a/tests/language/nnbd/try_catch/default_catch_type_error_test.dart
+++ b/tests/language/nnbd/try_catch/default_catch_type_error_test.dart
@@ -7,7 +7,7 @@ void main() {
     error.notAMethodOnObject();
     //    ^^^^^^^^^^^^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-    // [cfe] The method 'notAMethodOnObject' isn't defined for the class 'Object'.
+    // [cfe] The method 'notAMethodOnObject' isn't defined for the type 'Object'.
     _takesObject(error);
   }
 }
diff --git a/tests/language/nnbd/type_promotion/downwards_inference_error_test.dart b/tests/language/nnbd/type_promotion/downwards_inference_error_test.dart
index 0906219792e..0b6269ec8e2 100644
--- a/tests/language/nnbd/type_promotion/downwards_inference_error_test.dart
+++ b/tests/language/nnbd/type_promotion/downwards_inference_error_test.dart
@@ -41,18 +41,18 @@ void main() {
       x.dMethod1("hello");
       //^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-      // [cfe] The method 'dMethod1' isn't defined for the class 'C<String>'.
+      // [cfe] The method 'dMethod1' isn't defined for the type 'C<String>'.
       x.dMethod2(3);
       //^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-      // [cfe] The method 'dMethod2' isn't defined for the class 'C<String>'.
+      // [cfe] The method 'dMethod2' isn't defined for the type 'C<String>'.
 
       var t0 = x.cMethod("hello");
       t0.length;
       t0.arglebargle; // t0 is not dynamic
       // ^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'arglebargle' isn't defined for the class 'String'.
+      // [cfe] The getter 'arglebargle' isn't defined for the type 'String'.
 
       // y has type D<String, int>
       var t1 = y.dMethod1("hello");
@@ -60,13 +60,13 @@ void main() {
       t1.arglebargle; // t1 is not dynamic
       // ^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'arglebargle' isn't defined for the class 'String'.
+      // [cfe] The getter 'arglebargle' isn't defined for the type 'String'.
       var t2 = y.dMethod2(3);
       t2.isEven;
       t2.arglebargle; // t2 is not dynamic
       // ^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'arglebargle' isn't defined for the class 'int'.
+      // [cfe] The getter 'arglebargle' isn't defined for the type 'int'.
     }
 
     // Establish D<String, int> as a type of interest
@@ -84,13 +84,13 @@ void main() {
       t0.arglebargle; // t0 is not dynamic
       // ^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'arglebargle' isn't defined for the class 'String'.
+      // [cfe] The getter 'arglebargle' isn't defined for the type 'String'.
       var t1 = x.dMethod2(3);
       t1.isEven;
       t1.arglebargle; // t1 is not dynamic
       // ^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'arglebargle' isn't defined for the class 'int'.
+      // [cfe] The getter 'arglebargle' isn't defined for the type 'int'.
 
       // y has type D<String, int>
       var t2 = y.dMethod1("hello");
@@ -98,13 +98,13 @@ void main() {
       t2.arglebargle; // t2 is not dynamic
       // ^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'arglebargle' isn't defined for the class 'String'.
+      // [cfe] The getter 'arglebargle' isn't defined for the type 'String'.
       var t3 = y.dMethod2(3);
       t3.isEven;
       t3.arglebargle; // t3 is not dynamic
       // ^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'arglebargle' isn't defined for the class 'int'.
+      // [cfe] The getter 'arglebargle' isn't defined for the type 'int'.
     }
 
     // Inference should use D<String, int> as a downwards context, T from
@@ -119,34 +119,34 @@ void main() {
       x.dMethod1("hello");
       //^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-      // [cfe] The method 'dMethod1' isn't defined for the class 'C<String>'.
+      // [cfe] The method 'dMethod1' isn't defined for the type 'C<String>'.
       x.dMethod2(3);
       //^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-      // [cfe] The method 'dMethod2' isn't defined for the class 'C<String>'.
+      // [cfe] The method 'dMethod2' isn't defined for the type 'C<String>'.
 
       var t0 = x.cMethod("hello");
       t0.length;
       t0.arglebargle; // t0 is not dynamic
       // ^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'arglebargle' isn't defined for the class 'String'.
+      // [cfe] The getter 'arglebargle' isn't defined for the type 'String'.
 
       // C<String>, and not D<String, int>
       y.dMethod1("hello");
       //^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-      // [cfe] The method 'dMethod1' isn't defined for the class 'C<String>'.
+      // [cfe] The method 'dMethod1' isn't defined for the type 'C<String>'.
       y.dMethod2(3);
       //^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-      // [cfe] The method 'dMethod2' isn't defined for the class 'C<String>'.
+      // [cfe] The method 'dMethod2' isn't defined for the type 'C<String>'.
       var t1 = y.cMethod("hello");
       t1.length;
       t1.arglebargle; // t0 is not dynamic
       // ^^^^^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'arglebargle' isn't defined for the class 'String'.
+      // [cfe] The getter 'arglebargle' isn't defined for the type 'String'.
     }
   }
 }
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_dynamic_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_dynamic_error_test.dart
index dbc53ef81aa..0f10db34922 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_dynamic_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_dynamic_error_test.dart
@@ -71,5 +71,5 @@ main() {
   T<List<List<List<List>>>>.staticMethod<T<int>>();
   //                        ^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'staticMethod' isn't defined for the class 'Type'.
+  // [cfe] The method 'staticMethod' isn't defined for the type 'Type'.
 }
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart
index 2b0cc7b394e..7f33815dd56 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart
@@ -111,7 +111,7 @@ main() {
   // [cfe] Can't use a typedef denoting a type variable as a constructor, nor for a static member access.
   //                        ^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'staticMethod' isn't defined for the class 'Type'.
+  // [cfe] The method 'staticMethod' isn't defined for the type 'Type'.
 
   T<Object>();
   // [error column 3, length 1]
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_void_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_void_error_test.dart
index 4e3295fa8dc..8b8555d21f8 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_void_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_void_error_test.dart
@@ -80,5 +80,5 @@ main() {
   T<List<List<List<List>>>>.staticMethod<T<int>>();
   //                        ^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'staticMethod' isn't defined for the class 'Type'.
+  // [cfe] The method 'staticMethod' isn't defined for the type 'Type'.
 }
diff --git a/tests/language/nonfunction_type_aliases/usage_dynamic_error_test.dart b/tests/language/nonfunction_type_aliases/usage_dynamic_error_test.dart
index 874926e693f..62c2bce58af 100644
--- a/tests/language/nonfunction_type_aliases/usage_dynamic_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_dynamic_error_test.dart
@@ -58,7 +58,7 @@ main() {
   T.named();
   //^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'named' isn't defined for the class 'Type'.
+  // [cfe] The method 'named' isn't defined for the type 'Type'.
 
   T v17 = foo<T>(T());
   //             ^
@@ -68,5 +68,5 @@ main() {
   T.staticMethod<T>();
   //^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'staticMethod' isn't defined for the class 'Type'.
+  // [cfe] The method 'staticMethod' isn't defined for the type 'Type'.
 }
diff --git a/tests/language/nonfunction_type_aliases/usage_type_variable_error_test.dart b/tests/language/nonfunction_type_aliases/usage_type_variable_error_test.dart
index 57eeb498716..41f8400f1c2 100644
--- a/tests/language/nonfunction_type_aliases/usage_type_variable_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_type_variable_error_test.dart
@@ -75,7 +75,7 @@ main() {
   // [cfe] Can't use a typedef denoting a type variable as a constructor, nor for a static member access.
   //^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'named' isn't defined for the class 'Type'.
+  // [cfe] The method 'named' isn't defined for the type 'Type'.
 
   T().unknownInstanceMethod();
   // [error column 3, length 1]
@@ -88,12 +88,12 @@ main() {
   // [cfe] Can't use a typedef denoting a type variable as a constructor, nor for a static member access.
   //^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'staticMethod' isn't defined for the class 'Type'.
+  // [cfe] The method 'staticMethod' isn't defined for the type 'Type'.
 
   T.unknownStaticMethod();
   // [error column 3]
   // [cfe] Can't use a typedef denoting a type variable as a constructor, nor for a static member access.
   //^^^^^^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'unknownStaticMethod' isn't defined for the class 'Type'.
+  // [cfe] The method 'unknownStaticMethod' isn't defined for the type 'Type'.
 }
diff --git a/tests/language/nonfunction_type_aliases/usage_void_error_test.dart b/tests/language/nonfunction_type_aliases/usage_void_error_test.dart
index dd5e686fb8a..c3889eea9b4 100644
--- a/tests/language/nonfunction_type_aliases/usage_void_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_void_error_test.dart
@@ -58,7 +58,7 @@ main() {
   T.named();
   //^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'named' isn't defined for the class 'Type'.
+  // [cfe] The method 'named' isn't defined for the type 'Type'.
 
   T v17 = foo<T>(T());
   //             ^
@@ -68,5 +68,5 @@ main() {
   T.staticMethod<T>();
   //^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'staticMethod' isn't defined for the class 'Type'.
+  // [cfe] The method 'staticMethod' isn't defined for the type 'Type'.
 }
diff --git a/tests/language/null/checked_null_test.dart b/tests/language/null/checked_null_test.dart
index 885bc9a6f73..ab8d1c2568e 100644
--- a/tests/language/null/checked_null_test.dart
+++ b/tests/language/null/checked_null_test.dart
@@ -24,5 +24,5 @@ bar() {
   new A().a?.foo();
   //         ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'foo' isn't defined for the class 'Map<dynamic, dynamic>'.
+  // [cfe] The method 'foo' isn't defined for the type 'Map<dynamic, dynamic>'.
 }
diff --git a/tests/language/null_aware/access_test.dart b/tests/language/null_aware/access_test.dart
index ec0708e413c..ba9489cc57b 100644
--- a/tests/language/null_aware/access_test.dart
+++ b/tests/language/null_aware/access_test.dart
@@ -103,13 +103,13 @@ main() {
   Expect.equals(null, nullC()?.bad);
   //                           ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'bad' isn't defined for the class 'C'.
+  // [cfe] The getter 'bad' isn't defined for the type 'C'.
   {
     B? b = new C(1) as dynamic;
     Expect.equals(1, b?.v);
     //                  ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'v' isn't defined for the class 'B'.
+    // [cfe] The getter 'v' isn't defined for the type 'B'.
   }
 
   // '?.' cannot be used to access toplevel properties in libraries imported via
diff --git a/tests/language/null_aware/assignment_test.dart b/tests/language/null_aware/assignment_test.dart
index 9b548f3b09a..46da2883834 100644
--- a/tests/language/null_aware/assignment_test.dart
+++ b/tests/language/null_aware/assignment_test.dart
@@ -131,7 +131,7 @@ main() {
   Expect.equals(null, nullC()?.bad = bad());
   //                           ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
-  // [cfe] The setter 'bad' isn't defined for the class 'C'.
+  // [cfe] The setter 'bad' isn't defined for the type 'C'.
   {
     B b = new C(1);
     Expect.equals(2, b?.v = 2);
@@ -139,7 +139,7 @@ main() {
     // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
     //                  ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
-    // [cfe] The setter 'v' isn't defined for the class 'B'.
+    // [cfe] The setter 'v' isn't defined for the type 'B'.
   }
 
   // e1?.v op= e2 is equivalent to ((x) => x?.v = x.v op e2)(e1).
@@ -192,7 +192,7 @@ main() {
   nullC()?.bad = bad();
   //       ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
-  // [cfe] The setter 'bad' isn't defined for the class 'C'.
+  // [cfe] The setter 'bad' isn't defined for the type 'C'.
   {
     B bname = new C(1);
     bname?.v += 2;
@@ -201,8 +201,8 @@ main() {
     //     ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_SETTER
-    // [cfe] The getter 'v' isn't defined for the class 'B'.
-    // [cfe] The setter 'v' isn't defined for the class 'B'.
+    // [cfe] The getter 'v' isn't defined for the type 'B'.
+    // [cfe] The setter 'v' isn't defined for the type 'B'.
   }
   {
     D d = new D(new E());
diff --git a/tests/language/null_aware/invocation_test.dart b/tests/language/null_aware/invocation_test.dart
index 5f76f66c318..ab88f880378 100644
--- a/tests/language/null_aware/invocation_test.dart
+++ b/tests/language/null_aware/invocation_test.dart
@@ -106,7 +106,7 @@ main() {
     Expect.equals(1, b?.f(() => 1));
     //                  ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-    // [cfe] The method 'f' isn't defined for the class 'B'.
+    // [cfe] The method 'f' isn't defined for the type 'B'.
   }
   {
     var i = 1 as int?;
diff --git a/tests/language/number/separators_error_no_experiment_test.dart b/tests/language/number/separators_error_no_experiment_test.dart
index 4ba714db2c3..7cea16fcd88 100644
--- a/tests/language/number/separators_error_no_experiment_test.dart
+++ b/tests/language/number/separators_error_no_experiment_test.dart
@@ -9,100 +9,93 @@ main() {
   // TODO(srawlins): The text of the expectations below is expected to change,
   // when the experiment is turned on by default.
   x = 1__000_000_000;
-  //  ^
-  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   //  ^^^^^^^^^^^^^^
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
-  x = 555_867_5309;
-  //  ^
   // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
+  x = 555_867_5309;
   //  ^^^^^^^^^^^^
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
-  x = -1_000_000;
-  //   ^
   // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
+  x = -1_000_000;
   //   ^^^^^^^^^
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
-  x = 00_1_00;
-  //  ^
   // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
+  x = 00_1_00;
   //  ^^^^^^^
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
-  x = -00_99;
-  //   ^
   // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
+  x = -00_99;
   //   ^^^^^
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
-  x = 0__0__0__0__0;
-  //  ^
   // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
+  x = 0__0__0__0__0;
   //  ^^^^^^^^^^^^^
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
+  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
 
   // Integers.
   x = 100_;
   //  ^
-  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
   //  ^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
+  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
 
   // Hexadecimal.
   x = 0x_00;
   //  ^
-  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
   //  ^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
+  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
 
   // Doubles.
   x = 3_.14;
   //  ^
-  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
   //  ^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
+  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   x = 3._14;
-  //    ^
-  // [cfe] The getter '_14' isn't defined for the class 'int'.
   //    ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
+  // [cfe] The getter '_14' isn't defined for the type 'int'.
 
   // Exponent notation.
   x = 1e_3;
   //  ^
-  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
   //  ^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
+  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   x = 1_e3;
   //  ^
-  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
   //  ^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
+  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   x = 1.2e_3;
   //  ^
-  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
   //  ^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
+  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   x = 1.2_e3;
   //  ^
-  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
   //  ^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
+  // [cfe] This requires the experimental 'digit-separators' language feature to be enabled.
 
   x = 1._0e-1;
   //    ^^^
-  // [cfe] The getter '_0e' isn't defined for the class 'int'.
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
+  // [cfe] The getter '_0e' isn't defined for the type 'int'.
 }
diff --git a/tests/language/number/separators_error_test.dart b/tests/language/number/separators_error_test.dart
index 544266683fc..b32cb4fb556 100644
--- a/tests/language/number/separators_error_test.dart
+++ b/tests/language/number/separators_error_test.dart
@@ -8,176 +8,144 @@ main() {
   Object x;
   // Integers.
   x = 100_;
-  //  ^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 100___;
-  //  ^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
 
   // Hexadecimal.
   x = 0x_00;
-  //  ^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 0x___00;
-  //  ^^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 0x00_;
-  //  ^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 0x00___;
-  //  ^^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 0_x00;
-  //  ^^^^^
-  // [cfe] Expected ';' after this.
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
-  //    ^
-  // [cfe] Undefined name 'x00'.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
-  //    ^^^
-  // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
   //  ^^
   // [analyzer] SYNTACTIC_ERROR.EXPECTED_TOKEN
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
+  // [cfe] Expected ';' after this.
+  //    ^^^
+  // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
+  // [cfe] Undefined name 'x00'.
 
   // Doubles.
   x = 3.14_;
-  //  ^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 3.14___;
-  //  ^^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 3_.14;
-  //  ^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 3___.14;
-  //  ^^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 3._14;
-  //    ^
-  // [cfe] The getter '_14' isn't defined for the class 'int'.
   //    ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
+  // [cfe] The getter '_14' isn't defined for the type 'int'.
   x = 3.___14;
-  //    ^^^
-  // [cfe] The getter '___14' isn't defined for the class 'int'.
   //    ^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
+  // [cfe] The getter '___14' isn't defined for the type 'int'.
 
   // Exponent notation.
   x = 1e3_;
-  //  ^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1e3___;
-  //  ^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1e_3;
-  //  ^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1e___3;
-  //  ^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1e_+3;
-  //  ^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1e___+3;
-  //  ^^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1e+_3;
-  //  ^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1e+___3;
-  //  ^^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1_e3;
-  //  ^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1___e3;
-  //  ^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1.2e3_;
-  //  ^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1.2e3___;
-  //  ^^^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1.2e_3;
-  //  ^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1.2e___3;
-  //  ^^^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = .0e_+3;
-  //  ^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = .0e___+3;
-  //  ^^^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1.2_e3;
-  //  ^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   x = 1.2___e3;
-  //  ^^^^^^^^
-  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
   //  ^
   // [analyzer] SYNTACTIC_ERROR.UNEXPECTED_SEPARATOR_IN_NUMBER
+  // [cfe] Digit separators ('_') in a number literal can only be placed between two digits.
 
   x = 1._0e-1;
   //    ^^^
-  // [cfe] The getter '_0e' isn't defined for the class 'int'.
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
+  // [cfe] The getter '_0e' isn't defined for the type 'int'.
 }
diff --git a/tests/language/operator/equals_test.dart b/tests/language/operator/equals_test.dart
index 1e27c63640d..62ccc7318d0 100644
--- a/tests/language/operator/equals_test.dart
+++ b/tests/language/operator/equals_test.dart
@@ -18,7 +18,7 @@ class B extends A {
   foo() => (super == null) + 4;
   //                       ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '+' isn't defined for the class 'bool'.
+  // [cfe] The operator '+' isn't defined for the type 'bool'.
 }
 
 main() {
diff --git a/tests/language/operator/logical_expression3_test.dart b/tests/language/operator/logical_expression3_test.dart
index dc1157f2863..bec22fba866 100644
--- a/tests/language/operator/logical_expression3_test.dart
+++ b/tests/language/operator/logical_expression3_test.dart
@@ -25,7 +25,7 @@ main() {
   if ((o is! num && o.length == 4) || (nonInlinedNumTypeCheck(o))) {
     //                ^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'length' isn't defined for the class 'Object'.
+    // [cfe] The getter 'length' isn't defined for the type 'Object'.
     Expect.fail("Type-check failed");
   }
 }
diff --git a/tests/language/optimize/inferrer_constructor5_test.dart b/tests/language/optimize/inferrer_constructor5_test.dart
index 186b3c9c353..5001bb9c087 100644
--- a/tests/language/optimize/inferrer_constructor5_test.dart
+++ b/tests/language/optimize/inferrer_constructor5_test.dart
@@ -9,7 +9,7 @@ class A {
     print(field + 42);
     //    ^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'field' isn't defined for the class 'A'.
+    // [cfe] The getter 'field' isn't defined for the type 'A'.
   }
 }
 
diff --git a/tests/language/override/method_with_field_test.dart b/tests/language/override/method_with_field_test.dart
index 7d31ba2f4aa..4ecc4b508d7 100644
--- a/tests/language/override/method_with_field_test.dart
+++ b/tests/language/override/method_with_field_test.dart
@@ -32,6 +32,6 @@ main() {
   Expect.equals(42, sup.superInstanceMethod());
   //                    ^^^^^^^^^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'superInstanceMethod' isn't defined for the class 'Super'.
+  // [cfe] The method 'superInstanceMethod' isn't defined for the type 'Super'.
   Expect.equals(42, sub.superInstanceMethod());
 }
diff --git a/tests/language/patterns/issue52202_error_test.dart b/tests/language/patterns/issue52202_error_test.dart
index f458582563e..7c8680256fc 100644
--- a/tests/language/patterns/issue52202_error_test.dart
+++ b/tests/language/patterns/issue52202_error_test.dart
@@ -12,7 +12,7 @@ void f(x) {
       // ^
       // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
       //      ^
-      // [cfe] The getter 'foo' isn't defined for the class 'int?'.
+      // [cfe] The getter 'foo' isn't defined for the type 'int?'.
       break;
   }
 }
diff --git a/tests/language/patterns/nullable_object_pattern_error_test.dart b/tests/language/patterns/nullable_object_pattern_error_test.dart
index ae1e9acd7e6..14002a7982a 100644
--- a/tests/language/patterns/nullable_object_pattern_error_test.dart
+++ b/tests/language/patterns/nullable_object_pattern_error_test.dart
@@ -14,7 +14,7 @@ void nullableWithField(x) {
       // ^
       // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
       //         ^
-      // [cfe] The getter 'isEven' isn't defined for the class 'int?'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'int?'.
       break;
   }
 }
@@ -26,7 +26,7 @@ void potentiallyNullableWithField<T extends int?>(x) {
       // ^
       // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
       //         ^
-      // [cfe] The getter 'isEven' isn't defined for the class 'int?'.
+      // [cfe] The getter 'isEven' isn't defined for the type 'int?'.
       break;
   }
 }
diff --git a/tests/language/prefix/shadow_test.dart b/tests/language/prefix/shadow_test.dart
index 25841657269..cb15fc690ba 100644
--- a/tests/language/prefix/shadow_test.dart
+++ b/tests/language/prefix/shadow_test.dart
@@ -28,7 +28,7 @@ main() {
     result = lib10.Library10.static_fld;
     //             ^^^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'Library10' isn't defined for the class 'int'.
+    // [cfe] The getter 'Library10' isn't defined for the type 'int'.
     Expect.equals(4, result);
   }
 
diff --git a/tests/language/private/member1_test.dart b/tests/language/private/member1_test.dart
index 7a0df1bfbfe..8dc07c86393 100644
--- a/tests/language/private/member1_test.dart
+++ b/tests/language/private/member1_test.dart
@@ -11,7 +11,7 @@ class Test extends B {
     _instanceField = true;
     // [error column 5, length 14]
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The setter '_instanceField' isn't defined for the class 'Test'.
+    // [cfe] The setter '_instanceField' isn't defined for the type 'Test'.
   }
 }
 
diff --git a/tests/language/private/member2_test.dart b/tests/language/private/member2_test.dart
index 5ff99186490..320e8234aee 100644
--- a/tests/language/private/member2_test.dart
+++ b/tests/language/private/member2_test.dart
@@ -11,7 +11,7 @@ class Test extends B {
     _staticField = true;
     // [error column 5]
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The setter '_staticField' isn't defined for the class 'Test'.
+    // [cfe] The setter '_staticField' isn't defined for the type 'Test'.
   }
 }
 
diff --git a/tests/language/private/member3_test.dart b/tests/language/private/member3_test.dart
index e4c0e5d01be..c44a5481595 100644
--- a/tests/language/private/member3_test.dart
+++ b/tests/language/private/member3_test.dart
@@ -11,7 +11,7 @@ class Test extends B {
     _fun();
     // [error column 5]
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-    // [cfe] The method '_fun' isn't defined for the class 'Test'.
+    // [cfe] The method '_fun' isn't defined for the type 'Test'.
   }
 }
 
diff --git a/tests/language/records/type_inference_error_test.dart b/tests/language/records/type_inference_error_test.dart
index 808283b4c3d..34b16ea18f1 100644
--- a/tests/language/records/type_inference_error_test.dart
+++ b/tests/language/records/type_inference_error_test.dart
@@ -69,7 +69,7 @@ main() {
         ..$1.abs(),
       //     ^^^
       // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-      // [cfe] The method 'abs' isn't defined for the class 'Object?'.
+      // [cfe] The method 'abs' isn't defined for the type 'Object?'.
     );
     contextRecordNamedUnknown(
       (f1: objQ)
@@ -77,7 +77,7 @@ main() {
         ..f1.abs(),
       //     ^^^
       // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-      // [cfe] The method 'abs' isn't defined for the class 'Object?'.
+      // [cfe] The method 'abs' isn't defined for the type 'Object?'.
     );
 
     // - Ki=dynamic and Si=Object?, so Ri=dynamic and Si <: Ri; thus
@@ -88,7 +88,7 @@ main() {
         ..$1.abs(),
       //     ^^^
       // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-      // [cfe] The method 'abs' isn't defined for the class 'Object?'.
+      // [cfe] The method 'abs' isn't defined for the type 'Object?'.
     );
     context<({dynamic f1})>(
       (f1: objQ)
@@ -96,7 +96,7 @@ main() {
         ..f1.abs(),
       //     ^^^
       // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-      // [cfe] The method 'abs' isn't defined for the class 'Object?'.
+      // [cfe] The method 'abs' isn't defined for the type 'Object?'.
     );
 
     // - Ki=Object? and Si=Object?, so Ri=Object? and Si <: Ri; thus
@@ -107,7 +107,7 @@ main() {
         ..$1.abs(),
       //     ^^^
       // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-      // [cfe] The method 'abs' isn't defined for the class 'Object?'.
+      // [cfe] The method 'abs' isn't defined for the type 'Object?'.
     );
     context<({Object? f1})>(
       (f1: objQ)
@@ -115,7 +115,7 @@ main() {
         ..f1.abs(),
       //     ^^^
       // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-      // [cfe] The method 'abs' isn't defined for the class 'Object?'.
+      // [cfe] The method 'abs' isn't defined for the type 'Object?'.
     );
   }
 
diff --git a/tests/language/regress/regress12561_test.dart b/tests/language/regress/regress12561_test.dart
index d3428841ca7..fbc7bb19654 100644
--- a/tests/language/regress/regress12561_test.dart
+++ b/tests/language/regress/regress12561_test.dart
@@ -17,5 +17,5 @@ main() {
   Expect.throws(() => new C().foo, (e) => e is Error);
   //                          ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'foo' isn't defined for the class 'C'.
+  // [cfe] The getter 'foo' isn't defined for the type 'C'.
 }
diff --git a/tests/language/rewrite/implicit_this_test.dart b/tests/language/rewrite/implicit_this_test.dart
index d42454567fd..139181e88e5 100644
--- a/tests/language/rewrite/implicit_this_test.dart
+++ b/tests/language/rewrite/implicit_this_test.dart
@@ -13,7 +13,7 @@ class Foo {
     return x + y + z;
     //         ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+    // [cfe] The getter 'y' isn't defined for the type 'Foo'.
   }
 
   // Shadow the 'y' field in various ways
@@ -21,7 +21,7 @@ class Foo {
     return x + this.y + y;
     //              ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+    // [cfe] The getter 'y' isn't defined for the type 'Foo'.
   }
 
   shadow_y_local(z) {
@@ -29,7 +29,7 @@ class Foo {
     return x + this.y + y;
     //              ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+    // [cfe] The getter 'y' isn't defined for the type 'Foo'.
   }
 
   shadow_y_capturedLocal(z) {
@@ -38,7 +38,7 @@ class Foo {
       return x + this.y + y;
       //              ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+      // [cfe] The getter 'y' isn't defined for the type 'Foo'.
     }
 
     return foo();
@@ -49,7 +49,7 @@ class Foo {
       return x + this.y + y;
       //              ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+      // [cfe] The getter 'y' isn't defined for the type 'Foo'.
     }
 
     return foo(z);
@@ -61,7 +61,7 @@ class Foo {
       return x + this.y + y;
       //              ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+      // [cfe] The getter 'y' isn't defined for the type 'Foo'.
     }
 
     return foo();
@@ -72,7 +72,7 @@ class Foo {
     return this.x + y + x;
     //              ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+    // [cfe] The getter 'y' isn't defined for the type 'Foo'.
   }
 
   shadow_x_local(z) {
@@ -80,7 +80,7 @@ class Foo {
     return this.x + y + x;
     //              ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-    // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+    // [cfe] The getter 'y' isn't defined for the type 'Foo'.
   }
 
   shadow_x_capturedLocal(z) {
@@ -89,7 +89,7 @@ class Foo {
       return this.x + y + x;
       //              ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-      // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+      // [cfe] The getter 'y' isn't defined for the type 'Foo'.
     }
 
     return foo();
@@ -100,7 +100,7 @@ class Foo {
       return this.x + y + x;
       //              ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-      // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+      // [cfe] The getter 'y' isn't defined for the type 'Foo'.
     }
 
     return foo(z);
@@ -112,7 +112,7 @@ class Foo {
       return this.x + y + x;
       //              ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
-      // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+      // [cfe] The getter 'y' isn't defined for the type 'Foo'.
     }
 
     return foo();
@@ -122,10 +122,10 @@ class Foo {
     return x + this.y + toplevel + this.toplevel;
     //              ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'y' isn't defined for the class 'Foo'.
+    // [cfe] The getter 'y' isn't defined for the type 'Foo'.
     //                                  ^^^^^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'toplevel' isn't defined for the class 'Foo'.
+    // [cfe] The getter 'toplevel' isn't defined for the type 'Foo'.
   }
 }
 
diff --git a/tests/language/setter/no_getter_test.dart b/tests/language/setter/no_getter_test.dart
index 194d299f755..9d625743c30 100644
--- a/tests/language/setter/no_getter_test.dart
+++ b/tests/language/setter/no_getter_test.dart
@@ -18,5 +18,5 @@ main() {
   print(ex.foo++);
   //       ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'foo' isn't defined for the class 'Example'.
+  // [cfe] The getter 'foo' isn't defined for the type 'Example'.
 }
diff --git a/tests/language/static/field1_test.dart b/tests/language/static/field1_test.dart
index 7c3c338b8ca..4965b14ca26 100644
--- a/tests/language/static/field1_test.dart
+++ b/tests/language/static/field1_test.dart
@@ -15,7 +15,7 @@ class StaticField1Test {
       var x = foo.x;
       //          ^
       // [analyzer] COMPILE_TIME_ERROR.INSTANCE_ACCESS_TO_STATIC_MEMBER
-      // [cfe] The getter 'x' isn't defined for the class 'Foo'.
+      // [cfe] The getter 'x' isn't defined for the type 'Foo'.
     }
   }
 }
diff --git a/tests/language/static/field1a_test.dart b/tests/language/static/field1a_test.dart
index 27a336d8181..b942ccd008f 100644
--- a/tests/language/static/field1a_test.dart
+++ b/tests/language/static/field1a_test.dart
@@ -15,7 +15,7 @@ class StaticField1aTest {
       var m = foo.m;
       //          ^
       // [analyzer] COMPILE_TIME_ERROR.INSTANCE_ACCESS_TO_STATIC_MEMBER
-      // [cfe] The getter 'm' isn't defined for the class 'Foo'.
+      // [cfe] The getter 'm' isn't defined for the type 'Foo'.
     }
   }
 }
diff --git a/tests/language/string/interpolation_test.dart b/tests/language/string/interpolation_test.dart
index 2b0f4e568a1..87223cf5ccb 100644
--- a/tests/language/string/interpolation_test.dart
+++ b/tests/language/string/interpolation_test.dart
@@ -61,7 +61,7 @@ class StringInterpolationTest {
       "${i.toHorse()}";
       //   ^^^^^^^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-      // [cfe] The method 'toHorse' isn't defined for the class 'int'.
+      // [cfe] The method 'toHorse' isn't defined for the type 'int'.
     }
 
     Expect.equals("${m}", "$m");
diff --git a/tests/language/string/no_operator_test.dart b/tests/language/string/no_operator_test.dart
index a7eabf71677..988a37ab2b8 100644
--- a/tests/language/string/no_operator_test.dart
+++ b/tests/language/string/no_operator_test.dart
@@ -10,23 +10,23 @@ main() {
   Expect.throws(() => x < y);
   //                    ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '<' isn't defined for the class 'String'.
+  // [cfe] The operator '<' isn't defined for the type 'String'.
   Expect.throws(() => x <= y);
   //                    ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '<=' isn't defined for the class 'String'.
+  // [cfe] The operator '<=' isn't defined for the type 'String'.
   Expect.throws(() => x > y);
   //                    ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '>' isn't defined for the class 'String'.
+  // [cfe] The operator '>' isn't defined for the type 'String'.
   Expect.throws(() => x >= y);
   //                    ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '>=' isn't defined for the class 'String'.
+  // [cfe] The operator '>=' isn't defined for the type 'String'.
   Expect.throws(() => x - y);
   //                    ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '-' isn't defined for the class 'String'.
+  // [cfe] The operator '-' isn't defined for the type 'String'.
   Expect.throws(() => x * y);
   //                      ^
   // [analyzer] COMPILE_TIME_ERROR.ARGUMENT_TYPE_NOT_ASSIGNABLE
@@ -34,41 +34,41 @@ main() {
   Expect.throws(() => x / y);
   //                    ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '/' isn't defined for the class 'String'.
+  // [cfe] The operator '/' isn't defined for the type 'String'.
   Expect.throws(() => x ~/ y);
   //                    ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '~/' isn't defined for the class 'String'.
+  // [cfe] The operator '~/' isn't defined for the type 'String'.
   Expect.throws(() => x % y);
   //                    ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '%' isn't defined for the class 'String'.
+  // [cfe] The operator '%' isn't defined for the type 'String'.
   Expect.throws(() => x >> y);
   //                    ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '>>' isn't defined for the class 'String'.
+  // [cfe] The operator '>>' isn't defined for the type 'String'.
   Expect.throws(() => x << y);
   //                    ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '<<' isn't defined for the class 'String'.
+  // [cfe] The operator '<<' isn't defined for the type 'String'.
   Expect.throws(() => x & y);
   //                    ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '&' isn't defined for the class 'String'.
+  // [cfe] The operator '&' isn't defined for the type 'String'.
   Expect.throws(() => x | y);
   //                    ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '|' isn't defined for the class 'String'.
+  // [cfe] The operator '|' isn't defined for the type 'String'.
   Expect.throws(() => x ^ y);
   //                    ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '^' isn't defined for the class 'String'.
+  // [cfe] The operator '^' isn't defined for the type 'String'.
   Expect.throws(() => -x);
   //                  ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator 'unary-' isn't defined for the class 'String'.
+  // [cfe] The operator 'unary-' isn't defined for the type 'String'.
   Expect.throws(() => ~x);
   //                  ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '~' isn't defined for the class 'String'.
+  // [cfe] The operator '~' isn't defined for the type 'String'.
 }
diff --git a/tests/language/string/string_test.dart b/tests/language/string/string_test.dart
index 3a995046620..331d8adc9d5 100644
--- a/tests/language/string/string_test.dart
+++ b/tests/language/string/string_test.dart
@@ -32,7 +32,7 @@ class StringTest {
     a[1] = 12;
     // [error column 6, length 3]
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-    // [cfe] The operator '[]=' isn't defined for the class 'String'.
+    // [cfe] The operator '[]=' isn't defined for the type 'String'.
   }
 
   static testCharCodes() {
diff --git a/tests/language/super/assign_test.dart b/tests/language/super/assign_test.dart
index 9c09982b1b0..ea96baf2a76 100644
--- a/tests/language/super/assign_test.dart
+++ b/tests/language/super/assign_test.dart
@@ -18,5 +18,5 @@ main() {
   a.setX(42);
   //^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-  // [cfe] The method 'setX' isn't defined for the class 'A'.
+  // [cfe] The method 'setX' isn't defined for the type 'A'.
 }
diff --git a/tests/language/symbol/literal_test.dart b/tests/language/symbol/literal_test.dart
index 976158f7221..12ccb2c706e 100644
--- a/tests/language/symbol/literal_test.dart
+++ b/tests/language/symbol/literal_test.dart
@@ -48,5 +48,5 @@ main() {
   //                                   ^^^^^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
   //                                              ^
-  // [cfe] The method 'call' isn't defined for the class 'Symbol'.
+  // [cfe] The method 'call' isn't defined for the type 'Symbol'.
 }
diff --git a/tests/language/type_object/first_class_types_literals_test.dart b/tests/language/type_object/first_class_types_literals_test.dart
index 29ac65b7f3c..66d90084285 100644
--- a/tests/language/type_object/first_class_types_literals_test.dart
+++ b/tests/language/type_object/first_class_types_literals_test.dart
@@ -60,15 +60,15 @@ main() {
   Expect.throwsNoSuchMethodError(() => C + 1);
   //                                     ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '+' isn't defined for the class 'Type'.
+  // [cfe] The operator '+' isn't defined for the type 'Type'.
   Expect.throwsNoSuchMethodError(() => C[2]);
   //                                    ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]' isn't defined for the class 'Type'.
+  // [cfe] The operator '[]' isn't defined for the type 'Type'.
   Expect.throwsNoSuchMethodError(() => C[2] = 'hest');
   //                                    ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]=' isn't defined for the class 'Type'.
+  // [cfe] The operator '[]=' isn't defined for the type 'Type'.
   Expect.throwsNoSuchMethodError(() => dynamic = 1);
   //                                   ^^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_TYPE
@@ -80,15 +80,15 @@ main() {
   Expect.throwsNoSuchMethodError(() => dynamic + 1);
   //                                           ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '+' isn't defined for the class 'Type'.
+  // [cfe] The operator '+' isn't defined for the type 'Type'.
   Expect.throwsNoSuchMethodError(() => dynamic[2]);
   //                                          ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]' isn't defined for the class 'Type'.
+  // [cfe] The operator '[]' isn't defined for the type 'Type'.
   Expect.throwsNoSuchMethodError(() => dynamic[2] = 'hest');
   //                                          ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]=' isn't defined for the class 'Type'.
+  // [cfe] The operator '[]=' isn't defined for the type 'Type'.
 
   Expect.equals((dynamic).toString(), 'dynamic');
 }
diff --git a/tests/language/type_promotion/assign_test.dart b/tests/language/type_promotion/assign_test.dart
index 74c1322ba51..a607ba310ed 100644
--- a/tests/language/type_promotion/assign_test.dart
+++ b/tests/language/type_promotion/assign_test.dart
@@ -40,7 +40,7 @@ void main() {
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
   }
   if (a is B) {
     print(a.a);
@@ -52,6 +52,6 @@ void main() {
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
   }
 }
diff --git a/tests/language/type_promotion/closure_test.dart b/tests/language/type_promotion/closure_test.dart
index fc4d1616af7..db765af61b7 100644
--- a/tests/language/type_promotion/closure_test.dart
+++ b/tests/language/type_promotion/closure_test.dart
@@ -71,7 +71,7 @@ void test2() {
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
   }
 }
 
@@ -86,7 +86,7 @@ void test3() {
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
     void foo() {
       a = new D();
     }
@@ -95,7 +95,7 @@ void test3() {
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
   }
 }
 
@@ -110,7 +110,7 @@ void test3a() {
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
     void foo() {
       a = new D();
     }
@@ -119,7 +119,7 @@ void test3a() {
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
   }
 }
 
@@ -138,7 +138,7 @@ void test5() {
     func(() => a.b);
     //           ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
     print(a.a);
   }
   a = A();
@@ -178,7 +178,7 @@ void test8() {
   if (a is B && func(() => a.b)) {
     //                       ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
     print(a.a);
   }
   a = A();
@@ -189,7 +189,7 @@ void test9() {
   var b = a is B ? func(() => a.b) : false;
   //                            ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'b' isn't defined for the class 'A'.
+  // [cfe] The getter 'b' isn't defined for the type 'A'.
   a = A();
 }
 
@@ -219,7 +219,7 @@ void test12() {
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
   }
   a = A();
 }
diff --git a/tests/language/type_promotion/local_test.dart b/tests/language/type_promotion/local_test.dart
index 73666e09b52..8f8d646dc17 100644
--- a/tests/language/type_promotion/local_test.dart
+++ b/tests/language/type_promotion/local_test.dart
@@ -33,15 +33,15 @@ void main() {
   print(a.b);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'b' isn't defined for the class 'A'.
+  // [cfe] The getter 'b' isn't defined for the type 'A'.
   print(a.c);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'c' isn't defined for the class 'A'.
+  // [cfe] The getter 'c' isn't defined for the type 'A'.
   print(a.d);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   if (a is B) {
     print(a.a);
@@ -49,11 +49,11 @@ void main() {
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'B'.
+    // [cfe] The getter 'c' isn't defined for the type 'B'.
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'B'.
+    // [cfe] The getter 'd' isn't defined for the type 'B'.
 
     if (a is C) {
       print(a.a);
@@ -62,7 +62,7 @@ void main() {
       print(a.d);
       //      ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
     }
 
     print(a.a);
@@ -70,11 +70,11 @@ void main() {
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'B'.
+    // [cfe] The getter 'c' isn't defined for the type 'B'.
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'B'.
+    // [cfe] The getter 'd' isn't defined for the type 'B'.
   }
   if (a is C) {
     print(a.a);
@@ -83,7 +83,7 @@ void main() {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
 
     if (a is B) {
       print(a.a);
@@ -92,7 +92,7 @@ void main() {
       print(a.d);
       //      ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
     }
     if (a is D) {
       print(a.a);
@@ -101,7 +101,7 @@ void main() {
       print(a.d);
       //      ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
     }
 
     print(a.a);
@@ -110,33 +110,33 @@ void main() {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
 
   print(a.a);
   print(a.b);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'b' isn't defined for the class 'A'.
+  // [cfe] The getter 'b' isn't defined for the type 'A'.
   print(a.c);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'c' isn't defined for the class 'A'.
+  // [cfe] The getter 'c' isn't defined for the type 'A'.
   print(a.d);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   if (a is D) {
     print(a.a);
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'D'.
+    // [cfe] The getter 'b' isn't defined for the type 'D'.
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'D'.
+    // [cfe] The getter 'c' isn't defined for the type 'D'.
     print(a.d);
   }
 
@@ -144,15 +144,15 @@ void main() {
   print(a.b);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'b' isn't defined for the class 'A'.
+  // [cfe] The getter 'b' isn't defined for the type 'A'.
   print(a.c);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'c' isn't defined for the class 'A'.
+  // [cfe] The getter 'c' isn't defined for the type 'A'.
   print(a.d);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   var o1 = a is B
       ? '${a.a}'
@@ -160,24 +160,24 @@ void main() {
             '${a.c}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'B'.
+            // [cfe] The getter 'c' isn't defined for the type 'B'.
             '${a.d}'
       //         ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'B'.
+      // [cfe] The getter 'd' isn't defined for the type 'B'.
       : '${a.a}'
             '${a.b}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'b' isn't defined for the class 'A'.
+            // [cfe] The getter 'b' isn't defined for the type 'A'.
             '${a.c}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'A'.
+            // [cfe] The getter 'c' isn't defined for the type 'A'.
             '${a.d}';
   //             ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   var o2 = a is C
       ? '${a.a}'
@@ -186,45 +186,45 @@ void main() {
             '${a.d}'
       //         ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
       : '${a.a}'
             '${a.b}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'b' isn't defined for the class 'A'.
+            // [cfe] The getter 'b' isn't defined for the type 'A'.
             '${a.c}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'A'.
+            // [cfe] The getter 'c' isn't defined for the type 'A'.
             '${a.d}';
   //             ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   var o3 = a is D
       ? '${a.a}'
             '${a.b}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'b' isn't defined for the class 'D'.
+            // [cfe] The getter 'b' isn't defined for the type 'D'.
             '${a.c}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'D'.
+            // [cfe] The getter 'c' isn't defined for the type 'D'.
             '${a.d}'
       : '${a.a}'
             '${a.b}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'b' isn't defined for the class 'A'.
+            // [cfe] The getter 'b' isn't defined for the type 'A'.
             '${a.c}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'A'.
+            // [cfe] The getter 'c' isn't defined for the type 'A'.
             '${a.d}';
   //             ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   if (a is B && a is B) {
     print(a.a);
@@ -232,11 +232,11 @@ void main() {
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'B'.
+    // [cfe] The getter 'c' isn't defined for the type 'B'.
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'B'.
+    // [cfe] The getter 'd' isn't defined for the type 'B'.
   }
   if (a is B && a is C) {
     print(a.a);
@@ -245,7 +245,7 @@ void main() {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
   if (a is C && a is B) {
     print(a.a);
@@ -254,7 +254,7 @@ void main() {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
   if (a is C && a is D) {
     print(a.a);
@@ -263,18 +263,18 @@ void main() {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
   if (a is D && a is C) {
     print(a.a);
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'D'.
+    // [cfe] The getter 'b' isn't defined for the type 'D'.
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'D'.
+    // [cfe] The getter 'c' isn't defined for the type 'D'.
     print(a.d);
   }
 }
diff --git a/tests/language/type_promotion/more_specific_test.dart b/tests/language/type_promotion/more_specific_test.dart
index 8d7ce5185a7..45662de1833 100644
--- a/tests/language/type_promotion/more_specific_test.dart
+++ b/tests/language/type_promotion/more_specific_test.dart
@@ -47,7 +47,7 @@ void testInterface() {
     x = a.c;
     //    ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'A'.
+    // [cfe] The getter 'c' isn't defined for the type 'A'.
   }
   B b = new B();
   if (b is A) {
@@ -59,7 +59,7 @@ void testInterface() {
     y = x.b;
     //    ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'A'.
+    // [cfe] The getter 'b' isn't defined for the type 'A'.
   }
 }
 
@@ -93,7 +93,7 @@ testGeneric() {
     x = d2.e;
     //     ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'e' isn't defined for the class 'D<A>'.
+    // [cfe] The getter 'e' isn't defined for the type 'D<A>'.
   }
 
   D<A> d3 = new E<B>(new B());
diff --git a/tests/language/type_promotion/multiple_test.dart b/tests/language/type_promotion/multiple_test.dart
index ea4ece442a3..3a0f9c887ef 100644
--- a/tests/language/type_promotion/multiple_test.dart
+++ b/tests/language/type_promotion/multiple_test.dart
@@ -37,29 +37,29 @@ void test(A a1) {
   print(a1.b);
   //       ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'b' isn't defined for the class 'A'.
+  // [cfe] The getter 'b' isn't defined for the type 'A'.
   print(a1.c);
   //       ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'c' isn't defined for the class 'A'.
+  // [cfe] The getter 'c' isn't defined for the type 'A'.
   print(a1.d);
   //       ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   print(a2.a);
   print(a2.b);
   //       ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'b' isn't defined for the class 'A'.
+  // [cfe] The getter 'b' isn't defined for the type 'A'.
   print(a2.c);
   //       ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'c' isn't defined for the class 'A'.
+  // [cfe] The getter 'c' isn't defined for the type 'A'.
   print(a2.d);
   //       ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   if (a1 is B && a2 is C) {
     print(a1.a);
@@ -67,11 +67,11 @@ void test(A a1) {
     print(a1.c);
     //       ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'B'.
+    // [cfe] The getter 'c' isn't defined for the type 'B'.
     print(a1.d);
     //       ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'B'.
+    // [cfe] The getter 'd' isn't defined for the type 'B'.
 
     print(a2.a);
     print(a2.b);
@@ -79,7 +79,7 @@ void test(A a1) {
     print(a2.d);
     //       ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
 
     if (a1 is C && a2 is D) {
       print(a1.a);
@@ -88,7 +88,7 @@ void test(A a1) {
       print(a1.d);
       //       ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
 
       print(a2.a);
       print(a2.b);
@@ -96,7 +96,7 @@ void test(A a1) {
       print(a2.d);
       //       ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
     }
   }
 
@@ -106,44 +106,44 @@ void test(A a1) {
             '${a1.c}'
             //    ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'B'.
+            // [cfe] The getter 'c' isn't defined for the type 'B'.
             '${a1.d}'
             //    ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'd' isn't defined for the class 'B'.
+            // [cfe] The getter 'd' isn't defined for the type 'B'.
             '${a2.a}'
             '${a2.b}'
             '${a2.c}'
             '${a2.d}'
       //          ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
       : '${a1.a}'
             '${a1.b}'
             //    ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'b' isn't defined for the class 'A'.
+            // [cfe] The getter 'b' isn't defined for the type 'A'.
             '${a1.c}'
             //    ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'A'.
+            // [cfe] The getter 'c' isn't defined for the type 'A'.
             '${a1.d}'
             //    ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'd' isn't defined for the class 'A'.
+            // [cfe] The getter 'd' isn't defined for the type 'A'.
             '${a2.a}'
             '${a2.b}'
             //    ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'b' isn't defined for the class 'A'.
+            // [cfe] The getter 'b' isn't defined for the type 'A'.
             '${a2.c}'
             //    ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'A'.
+            // [cfe] The getter 'c' isn't defined for the type 'A'.
             '${a2.d}';
   //              ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   if (a2 is C && a1 is B && a1 is C && a2 is B && a2 is D) {
     print(a1.a);
@@ -152,7 +152,7 @@ void test(A a1) {
     print(a1.d);
     //       ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
 
     print(a2.a);
     print(a2.b);
@@ -160,6 +160,6 @@ void test(A a1) {
     print(a2.d);
     //       ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
 }
diff --git a/tests/language/type_promotion/parameter_test.dart b/tests/language/type_promotion/parameter_test.dart
index d2ab058b99a..267e983a873 100644
--- a/tests/language/type_promotion/parameter_test.dart
+++ b/tests/language/type_promotion/parameter_test.dart
@@ -36,15 +36,15 @@ void test(A a) {
   print(a.b);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'b' isn't defined for the class 'A'.
+  // [cfe] The getter 'b' isn't defined for the type 'A'.
   print(a.c);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'c' isn't defined for the class 'A'.
+  // [cfe] The getter 'c' isn't defined for the type 'A'.
   print(a.d);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   if (a is B) {
     print(a.a);
@@ -52,11 +52,11 @@ void test(A a) {
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'B'.
+    // [cfe] The getter 'c' isn't defined for the type 'B'.
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'B'.
+    // [cfe] The getter 'd' isn't defined for the type 'B'.
 
     if (a is C) {
       print(a.a);
@@ -65,7 +65,7 @@ void test(A a) {
       print(a.d);
       //      ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
     }
 
     print(a.a);
@@ -73,11 +73,11 @@ void test(A a) {
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'B'.
+    // [cfe] The getter 'c' isn't defined for the type 'B'.
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'B'.
+    // [cfe] The getter 'd' isn't defined for the type 'B'.
   }
   if (a is C) {
     print(a.a);
@@ -86,7 +86,7 @@ void test(A a) {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
 
     if (a is B) {
       print(a.a);
@@ -95,7 +95,7 @@ void test(A a) {
       print(a.d);
       //      ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
     }
     if (a is D) {
       print(a.a);
@@ -104,7 +104,7 @@ void test(A a) {
       print(a.d);
       //      ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
     }
 
     print(a.a);
@@ -113,33 +113,33 @@ void test(A a) {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
 
   print(a.a);
   print(a.b);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'b' isn't defined for the class 'A'.
+  // [cfe] The getter 'b' isn't defined for the type 'A'.
   print(a.c);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'c' isn't defined for the class 'A'.
+  // [cfe] The getter 'c' isn't defined for the type 'A'.
   print(a.d);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   if (a is D) {
     print(a.a);
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'D'.
+    // [cfe] The getter 'b' isn't defined for the type 'D'.
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'D'.
+    // [cfe] The getter 'c' isn't defined for the type 'D'.
     print(a.d);
   }
 
@@ -147,15 +147,15 @@ void test(A a) {
   print(a.b);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'b' isn't defined for the class 'A'.
+  // [cfe] The getter 'b' isn't defined for the type 'A'.
   print(a.c);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'c' isn't defined for the class 'A'.
+  // [cfe] The getter 'c' isn't defined for the type 'A'.
   print(a.d);
   //      ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   var o1 = a is B
       ? '${a.a}'
@@ -163,24 +163,24 @@ void test(A a) {
             '${a.c}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'B'.
+            // [cfe] The getter 'c' isn't defined for the type 'B'.
             '${a.d}'
       //         ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'B'.
+      // [cfe] The getter 'd' isn't defined for the type 'B'.
       : '${a.a}'
             '${a.b}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'b' isn't defined for the class 'A'.
+            // [cfe] The getter 'b' isn't defined for the type 'A'.
             '${a.c}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'A'.
+            // [cfe] The getter 'c' isn't defined for the type 'A'.
             '${a.d}';
   //             ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   var o2 = a is C
       ? '${a.a}'
@@ -189,45 +189,45 @@ void test(A a) {
             '${a.d}'
       //         ^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'C'.
+      // [cfe] The getter 'd' isn't defined for the type 'C'.
       : '${a.a}'
             '${a.b}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'b' isn't defined for the class 'A'.
+            // [cfe] The getter 'b' isn't defined for the type 'A'.
             '${a.c}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'A'.
+            // [cfe] The getter 'c' isn't defined for the type 'A'.
             '${a.d}';
   //             ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   var o3 = a is D
       ? '${a.a}'
             '${a.b}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'b' isn't defined for the class 'D'.
+            // [cfe] The getter 'b' isn't defined for the type 'D'.
             '${a.c}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'D'.
+            // [cfe] The getter 'c' isn't defined for the type 'D'.
             '${a.d}'
       : '${a.a}'
             '${a.b}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'b' isn't defined for the class 'A'.
+            // [cfe] The getter 'b' isn't defined for the type 'A'.
             '${a.c}'
             //   ^
             // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-            // [cfe] The getter 'c' isn't defined for the class 'A'.
+            // [cfe] The getter 'c' isn't defined for the type 'A'.
             '${a.d}';
   //             ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'A'.
+  // [cfe] The getter 'd' isn't defined for the type 'A'.
 
   if (a is B && a is B) {
     print(a.a);
@@ -235,11 +235,11 @@ void test(A a) {
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'B'.
+    // [cfe] The getter 'c' isn't defined for the type 'B'.
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'B'.
+    // [cfe] The getter 'd' isn't defined for the type 'B'.
   }
   if (a is B && a is C) {
     print(a.a);
@@ -248,7 +248,7 @@ void test(A a) {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
   if (a is C && a is B) {
     print(a.a);
@@ -257,7 +257,7 @@ void test(A a) {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
   if (a is C && a is D) {
     print(a.a);
@@ -266,18 +266,18 @@ void test(A a) {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
   if (a is D && a is C) {
     print(a.a);
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'D'.
+    // [cfe] The getter 'b' isn't defined for the type 'D'.
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'D'.
+    // [cfe] The getter 'c' isn't defined for the type 'D'.
     print(a.d);
   }
   if (a is D &&
@@ -285,40 +285,40 @@ void test(A a) {
       a.b == ""
       //^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'b' isn't defined for the class 'D'.
+      // [cfe] The getter 'b' isn't defined for the type 'D'.
       &&
       a.c == ""
       //^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'c' isn't defined for the class 'D'.
+      // [cfe] The getter 'c' isn't defined for the type 'D'.
       &&
       a.d == "") {
     print(a.a);
     print(a.b);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'b' isn't defined for the class 'D'.
+    // [cfe] The getter 'b' isn't defined for the type 'D'.
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'D'.
+    // [cfe] The getter 'c' isn't defined for the type 'D'.
     print(a.d);
   }
   if (a.a == "" &&
       a.b == ""
       //^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'b' isn't defined for the class 'A'.
+      // [cfe] The getter 'b' isn't defined for the type 'A'.
       &&
       a.c == ""
       //^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'c' isn't defined for the class 'A'.
+      // [cfe] The getter 'c' isn't defined for the type 'A'.
       &&
       a.d == ""
       //^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'A'.
+      // [cfe] The getter 'd' isn't defined for the type 'A'.
       &&
       a is B &&
       a.a == "" &&
@@ -326,12 +326,12 @@ void test(A a) {
       a.c == ""
       //^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'c' isn't defined for the class 'B'.
+      // [cfe] The getter 'c' isn't defined for the type 'B'.
       &&
       a.d == ""
       //^
       // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-      // [cfe] The getter 'd' isn't defined for the class 'B'.
+      // [cfe] The getter 'd' isn't defined for the type 'B'.
       &&
       a is C &&
       a.a == "" &&
@@ -340,7 +340,7 @@ void test(A a) {
       a.d == ""
   //    ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'd' isn't defined for the class 'C'.
+  // [cfe] The getter 'd' isn't defined for the type 'C'.
   ) {
     print(a.a);
     print(a.b);
@@ -348,7 +348,7 @@ void test(A a) {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
   if ((a is B)) {
     print(a.a);
@@ -356,11 +356,11 @@ void test(A a) {
     print(a.c);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'c' isn't defined for the class 'B'.
+    // [cfe] The getter 'c' isn't defined for the type 'B'.
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'B'.
+    // [cfe] The getter 'd' isn't defined for the type 'B'.
   }
   if ((a is B && (a) is C) && a is B) {
     print(a.a);
@@ -369,6 +369,6 @@ void test(A a) {
     print(a.d);
     //      ^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-    // [cfe] The getter 'd' isn't defined for the class 'C'.
+    // [cfe] The getter 'd' isn't defined for the type 'C'.
   }
 }
diff --git a/tests/language/type_variable/bound_access_test.dart b/tests/language/type_variable/bound_access_test.dart
index 39d52ea229e..2d2af4f3b80 100644
--- a/tests/language/type_variable/bound_access_test.dart
+++ b/tests/language/type_variable/bound_access_test.dart
@@ -22,7 +22,7 @@ class NumClass<T extends num, S extends T> {
   num method2() => field1 + field2.length;
   //                               ^^^^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'length' isn't defined for the class 'num'.
+  // [cfe] The getter 'length' isn't defined for the type 'num'.
 }
 
 main() {
diff --git a/tests/language/type_variable/conflict2_test.dart b/tests/language/type_variable/conflict2_test.dart
index cdcf5768109..f4d0b637c9e 100644
--- a/tests/language/type_variable/conflict2_test.dart
+++ b/tests/language/type_variable/conflict2_test.dart
@@ -41,7 +41,7 @@ class C<T> {
   //        ^^^
   // [analyzer] COMPILE_TIME_ERROR.INVOCATION_OF_NON_FUNCTION_EXPRESSION
   //           ^
-  // [cfe] The method 'call' isn't defined for the class 'Type'.
+  // [cfe] The method 'call' isn't defined for the type 'Type'.
 
   // Runtime type T not accessible from static context. Compile-time error.
   static corge() => (T)();
@@ -51,13 +51,13 @@ class C<T> {
   // [analyzer] COMPILE_TIME_ERROR.TYPE_PARAMETER_REFERENCED_BY_STATIC
   // [cfe] Type variables can't be used in static members.
   //                   ^
-  // [cfe] The method 'call' isn't defined for the class 'Type'.
+  // [cfe] The method 'call' isn't defined for the type 'Type'.
 
   // Class '_Type' has no [] operator: NoSuchMethodError.
   grault() => T[0];
   //           ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]' isn't defined for the class 'Type'.
+  // [cfe] The operator '[]' isn't defined for the type 'Type'.
 
   // Runtime type T not accessible from static context. Compile-time error.
   static garply() => T[0];
@@ -66,13 +66,13 @@ class C<T> {
   // [cfe] Type variables can't be used in static members.
   //                  ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '[]' isn't defined for the class 'Type'.
+  // [cfe] The operator '[]' isn't defined for the type 'Type'.
 
   // Class '_Type' has no member m: NoSuchMethodError.
   waldo() => T.m;
   //           ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'm' isn't defined for the class 'Type'.
+  // [cfe] The getter 'm' isn't defined for the type 'Type'.
 
   // Runtime type T not accessible from static context. Compile-time error.
   static fred() => T.m;
@@ -81,7 +81,7 @@ class C<T> {
   // [cfe] Type variables can't be used in static members.
   //                 ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'm' isn't defined for the class 'Type'.
+  // [cfe] The getter 'm' isn't defined for the type 'Type'.
 }
 
 main() {
diff --git a/tests/language/type_variable/identifier_expression_test.dart b/tests/language/type_variable/identifier_expression_test.dart
index f816b4769a4..2c345859c52 100644
--- a/tests/language/type_variable/identifier_expression_test.dart
+++ b/tests/language/type_variable/identifier_expression_test.dart
@@ -14,7 +14,7 @@ class B<T> {
     T.func();
     //^^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-    // [cfe] The method 'func' isn't defined for the class 'Type'.
+    // [cfe] The method 'func' isn't defined for the type 'Type'.
   }
 }
 
diff --git a/tests/language/unsorted/fauxverride_test.dart b/tests/language/unsorted/fauxverride_test.dart
index f186e67d50b..597a5c0470b 100644
--- a/tests/language/unsorted/fauxverride_test.dart
+++ b/tests/language/unsorted/fauxverride_test.dart
@@ -100,9 +100,9 @@ main() {
   Expect.equals('super', new Super().instanceMethod());
   Expect.equals('sub', new Sub().instanceMethod());
   //                             ^
-  // [cfe] The method 'instanceMethod' isn't defined for the class 'Sub'.
+  // [cfe] The method 'instanceMethod' isn't defined for the type 'Sub'.
   Expect.equals('super', new Super().instanceMethod2());
   Expect.equals('super', new Sub().instanceMethod2());
   //                               ^
-  // [cfe] The method 'instanceMethod2' isn't defined for the class 'Sub'.
+  // [cfe] The method 'instanceMethod2' isn't defined for the type 'Sub'.
 }
diff --git a/tests/language/unsorted/typed_selector2_test.dart b/tests/language/unsorted/typed_selector2_test.dart
index 9eb493838ca..707bdbd6bd6 100644
--- a/tests/language/unsorted/typed_selector2_test.dart
+++ b/tests/language/unsorted/typed_selector2_test.dart
@@ -19,7 +19,7 @@ main() {
     a.foo();
     //^^^
     // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_METHOD
-    // [cfe] The method 'foo' isn't defined for the class 'int Function(dynamic, dynamic)'.
+    // [cfe] The method 'foo' isn't defined for the type 'int Function(dynamic, dynamic)'.
   }
   var b = new A();
   b.foo();
diff --git a/tests/language/variable/ref_before_declaration_test.dart b/tests/language/variable/ref_before_declaration_test.dart
index 9173482a48d..8b3afd2ee8e 100644
--- a/tests/language/variable/ref_before_declaration_test.dart
+++ b/tests/language/variable/ref_before_declaration_test.dart
@@ -60,7 +60,7 @@ class C {
       // [error column 7, length 1]
       // [analyzer] COMPILE_TIME_ERROR.REFERENCED_BEFORE_DECLARATION
       // [cfe] Local variable 'P' can't be referenced before it is declared.
-      // [cfe] The method 'P' isn't defined for the class 'C'.
+      // [cfe] The method 'P' isn't defined for the type 'C'.
     }
 
     void P() {
diff --git a/tests/language/variance/syntax/variance_type_parameter_error_syntax_test.dart b/tests/language/variance/syntax/variance_type_parameter_error_syntax_test.dart
index ec250c0579e..64362a83423 100644
--- a/tests/language/variance/syntax/variance_type_parameter_error_syntax_test.dart
+++ b/tests/language/variance/syntax/variance_type_parameter_error_syntax_test.dart
@@ -17,7 +17,7 @@ void A(out int foo) {
   List<out String> bar;
   //  ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '<' isn't defined for the class 'Type'.
+  // [cfe] The operator '<' isn't defined for the type 'Type'.
   //   ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
   // [analyzer] SYNTACTIC_ERROR.EXPECTED_TOKEN
@@ -25,7 +25,7 @@ void A(out int foo) {
   // [cfe] Undefined name 'out'.
   //             ^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_OPERATOR
-  // [cfe] The operator '>' isn't defined for the class 'Type'.
+  // [cfe] The operator '>' isn't defined for the type 'Type'.
   //               ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
   // [cfe] Undefined name 'bar'.
diff --git a/tests/language/void/void_type_usage_test.dart b/tests/language/void/void_type_usage_test.dart
index ce386c265c4..cc10611536e 100644
--- a/tests/language/void/void_type_usage_test.dart
+++ b/tests/language/void/void_type_usage_test.dart
@@ -105,7 +105,7 @@ Object? testVoidParam(void x) {
   // [cfe] This expression has type 'void' and can't be used.
   //^^
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-  // [cfe] The operator '+' isn't defined for the class 'void'.
+  // [cfe] The operator '+' isn't defined for the type 'void'.
 
   x.toString(); // param_toString
   // [error column 3, length 1]
@@ -180,7 +180,7 @@ Object? testVoidParam(void x) {
   -x; // param_negation
   // [error column 3, length 1]
   // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-  // [cfe] The operator 'unary-' isn't defined for the class 'void'.
+  // [cfe] The operator 'unary-' isn't defined for the type 'void'.
   // [error column 4, length 1]
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
   // [cfe] This expression has type 'void' and can't be used.
@@ -190,7 +190,7 @@ Object? testVoidParam(void x) {
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
   // [cfe] This expression has type 'void' and can't be used.
   // [error column 4]
-  // [cfe] The method 'call' isn't defined for the class 'void'.
+  // [cfe] The method 'call' isn't defined for the type 'void'.
 
   "hello$x"; // param_use_in_string_interpolation
   //     ^
@@ -481,7 +481,7 @@ Object? testVoidCall(void f()) {
   -f(); // call_negation
   // [error column 3, length 1]
   // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-  // [cfe] The operator 'unary-' isn't defined for the class 'void'.
+  // [cfe] The operator 'unary-' isn't defined for the type 'void'.
   // [error column 4, length 3]
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
   //^
@@ -493,7 +493,7 @@ Object? testVoidCall(void f()) {
   // [error column 4]
   // [cfe] This expression has type 'void' and can't be used.
   // ^
-  // [cfe] The method 'call' isn't defined for the class 'void'.
+  // [cfe] The method 'call' isn't defined for the type 'void'.
 
   "hello${f()}"; // call_use_in_string_interpolation
   //      ^^^
@@ -632,7 +632,7 @@ Object? testVoidLocal() {
   // [cfe] This expression has type 'void' and can't be used.
   //^^
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-  // [cfe] The operator '+' isn't defined for the class 'void'.
+  // [cfe] The operator '+' isn't defined for the type 'void'.
 
   x.toString(); // local_toString
   // [error column 3, length 1]
@@ -707,7 +707,7 @@ Object? testVoidLocal() {
   -x; // local_negation
   // [error column 3, length 1]
   // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-  // [cfe] The operator 'unary-' isn't defined for the class 'void'.
+  // [cfe] The operator 'unary-' isn't defined for the type 'void'.
   // [error column 4, length 1]
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
   // [cfe] This expression has type 'void' and can't be used.
@@ -717,7 +717,7 @@ Object? testVoidLocal() {
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
   // [cfe] This expression has type 'void' and can't be used.
   // [error column 4]
-  // [cfe] The method 'call' isn't defined for the class 'void'.
+  // [cfe] The method 'call' isn't defined for the type 'void'.
 
   "hello$x"; // local_use_in_string_interpolation
   //     ^
@@ -929,7 +929,7 @@ Object? testVoidFinalLocal() {
   -x; // final_local_negation
   // [error column 3, length 1]
   // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-  // [cfe] The operator 'unary-' isn't defined for the class 'void'.
+  // [cfe] The operator 'unary-' isn't defined for the type 'void'.
   // [error column 4, length 1]
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
   // [cfe] This expression has type 'void' and can't be used.
@@ -939,7 +939,7 @@ Object? testVoidFinalLocal() {
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
   // [cfe] This expression has type 'void' and can't be used.
   // [error column 4]
-  // [cfe] The method 'call' isn't defined for the class 'void'.
+  // [cfe] The method 'call' isn't defined for the type 'void'.
 
   "hello$x"; // final_local_use_in_string_interpolation
   //     ^
@@ -1072,7 +1072,7 @@ Object? testVoidGlobal() {
   // [cfe] This expression has type 'void' and can't be used.
   //     ^^
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-  // [cfe] The operator '+' isn't defined for the class 'void'.
+  // [cfe] The operator '+' isn't defined for the type 'void'.
 
   global.toString(); // global_toString
   // [error column 3, length 6]
@@ -1147,7 +1147,7 @@ Object? testVoidGlobal() {
   -global; // global_negation
   // [error column 3, length 1]
   // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-  // [cfe] The operator 'unary-' isn't defined for the class 'void'.
+  // [cfe] The operator 'unary-' isn't defined for the type 'void'.
   // [error column 4, length 6]
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
   // [cfe] This expression has type 'void' and can't be used.
@@ -1157,7 +1157,7 @@ Object? testVoidGlobal() {
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
   // [cfe] This expression has type 'void' and can't be used.
   //    ^
-  // [cfe] The method 'call' isn't defined for the class 'void'.
+  // [cfe] The method 'call' isn't defined for the type 'void'.
 
   "hello$global"; // global_use_in_string_interpolation
   //     ^^^^^^
@@ -1686,7 +1686,7 @@ Object? testInstanceField() {
   a.x += 1; // instance_plus_eq
   //  ^^
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-  // [cfe] The operator '+' isn't defined for the class 'void'.
+  // [cfe] The operator '+' isn't defined for the type 'void'.
 
   a.x.toString(); // instance_toString
   // [error column 3, length 3]
@@ -1810,7 +1810,7 @@ Object? testInstanceField() {
   b.x += 1; // instance2_plus_eq
   //  ^^
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-  // [cfe] The operator '+' isn't defined for the class 'void'.
+  // [cfe] The operator '+' isn't defined for the type 'void'.
 
   b.x.toString(); // instance2_toString
   // [error column 3, length 3]
@@ -1934,7 +1934,7 @@ Object? testInstanceField() {
   c.x += 1; // instance3_plus_eq
   //  ^^
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
-  // [cfe] The operator '+' isn't defined for the class 'void'.
+  // [cfe] The operator '+' isn't defined for the type 'void'.
 
   c.x.toString(); // instance3_toString
   // [error column 3, length 3]
@@ -2158,7 +2158,7 @@ Object? testParenthesized() {
   -(x); // paren_negation
   // [error column 3, length 1]
   // [analyzer] COMPILE_TIME_ERROR.UNCHECKED_USE_OF_NULLABLE_VALUE
-  // [cfe] The operator 'unary-' isn't defined for the class 'void'.
+  // [cfe] The operator 'unary-' isn't defined for the type 'void'.
   // [error column 4, length 3]
   // [analyzer] COMPILE_TIME_ERROR.USE_OF_VOID_RESULT
   //^
@@ -2170,7 +2170,7 @@ Object? testParenthesized() {
   // [error column 4]
   // [cfe] This expression has type 'void' and can't be used.
   // ^
-  // [cfe] The method 'call' isn't defined for the class 'void'.
+  // [cfe] The method 'call' isn't defined for the type 'void'.
 
   "hello${(x)}"; // paren_use_in_string_interpolation
   //      ^^^
diff --git a/tests/language/wildcard_variables/import/import_error_test.dart b/tests/language/wildcard_variables/import/import_error_test.dart
index fcaff747254..2cdca47780b 100644
--- a/tests/language/wildcard_variables/import/import_error_test.dart
+++ b/tests/language/wildcard_variables/import/import_error_test.dart
@@ -24,10 +24,10 @@ main() {
   value.bar;
   //    ^^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'bar' isn't defined for the class 'String'.
+  // [cfe] The getter 'bar' isn't defined for the type 'String'.
 
   value.fn;
   //    ^^
   // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_GETTER
-  // [cfe] The getter 'fn' isn't defined for the class 'String'.
+  // [cfe] The getter 'fn' isn't defined for the type 'String'.
 }