diff --git a/pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart b/pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart
index e23c9b86303..b39706c09b9 100644
--- a/pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart
@@ -3798,7 +3798,8 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
               node.name,
               unevaluatedArguments(
                   positionalArguments, {}, node.arguments.types))
-            ..fileOffset = node.fileOffset);
+            ..fileOffset = node.fileOffset
+            ..flags = node.flags);
     }
 
     return _handleInvocation(node, node.name, receiver, positionalArguments,
diff --git a/pkg/front_end/lib/src/fasta/type_inference/inference_visitor_base.dart b/pkg/front_end/lib/src/fasta/type_inference/inference_visitor_base.dart
index dca0d58a718..d6edd66a122 100644
--- a/pkg/front_end/lib/src/fasta/type_inference/inference_visitor_base.dart
+++ b/pkg/front_end/lib/src/fasta/type_inference/inference_visitor_base.dart
@@ -2391,6 +2391,7 @@ abstract class InferenceVisitorBase implements InferenceVisitor {
     assert(name != equalsName);
     Expression expression = new DynamicInvocation(
         DynamicAccessKind.Dynamic, receiver, name, arguments)
+      ..isImplicitCall = isImplicitCall
       ..fileOffset = fileOffset;
     return createNullAwareExpressionInferenceResult(
         result.inferredType, result.applyResult(expression), nullAwareGuards);
@@ -2741,6 +2742,7 @@ abstract class InferenceVisitorBase implements InferenceVisitor {
       // the parameters.
       expression = new DynamicInvocation(
           DynamicAccessKind.Dynamic, receiver, methodName, arguments)
+        ..isImplicitCall = isImplicitCall
         ..fileOffset = fileOffset;
     } else if (result.isInapplicable) {
       // This was a method invocation whose arguments didn't match
diff --git a/pkg/front_end/test/text_representation/data/expressions.dart b/pkg/front_end/test/text_representation/data/expressions.dart
index fd5aebb3179..b43dd8b9d62 100644
--- a/pkg/front_end/test/text_representation/data/expressions.dart
+++ b/pkg/front_end/test/text_representation/data/expressions.dart
@@ -241,6 +241,9 @@ exprGenericInvocation2b(Class variable) =>
 /*member: exprDynamicInvocation:variable.method1()*/
 exprDynamicInvocation(variable) => variable.method1();
 
+/*member: exprDynamicInvocationImplicitCall:variable()*/
+exprDynamicInvocationImplicitCall(variable) => variable();
+
 /*normal|limited.member: exprObjectInvocation:variable.{Object.toString}()*/
 /*verbose.member: exprObjectInvocation:variable.{dart.core::Object.toString}()*/
 exprObjectInvocation(variable) => variable.toString();
diff --git a/pkg/front_end/testcases/const_functions/non_function_invocation.dart.weak.outline.expect b/pkg/front_end/testcases/const_functions/non_function_invocation.dart.weak.outline.expect
index 2168b9b7bf7..6b31df88975 100644
--- a/pkg/front_end/testcases/const_functions/non_function_invocation.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/const_functions/non_function_invocation.dart.weak.outline.expect
@@ -2,7 +2,7 @@ library;
 import self as self;
 
 static const field dynamic a = null;
-static const field dynamic b = self::a{dynamic}.call();
+static const field dynamic b = self::a{dynamic}();
 static method main() → dynamic
   ;
 
diff --git a/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.strong.expect
index 5e943de942d..64c7a45d41b 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.strong.expect
@@ -50,9 +50,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class1};
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call(0);
+  dynamic c1b = f1b{dynamic}(0);
   self::expect(true, c1b is self::Class1);
-  self::throws(() → dynamic => f1b{dynamic}.call(""));
+  self::throws(() → dynamic => f1b{dynamic}(""));
   (core::int) → self::Class2 f2a = #C2;
   self::expect(true, f2a is (core::int) → self::Class2);
   self::expect(false, f2a is (core::String) → self::Class2);
@@ -64,9 +64,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class2};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call(0);
+  dynamic c2b = f2b{dynamic}(0);
   self::expect(true, c2b is self::Class2);
-  self::throws(() → dynamic => f2b{dynamic}.call(""));
+  self::throws(() → dynamic => f2b{dynamic}(""));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.strong.transformed.expect
index 0ef266f254a..f0f964f54f4 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.strong.transformed.expect
@@ -50,9 +50,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class1};
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call(0);
+  dynamic c1b = f1b{dynamic}(0);
   self::expect(true, c1b is self::Class1);
-  self::throws(() → dynamic => f1b{dynamic}.call(""));
+  self::throws(() → dynamic => f1b{dynamic}(""));
   (core::int) → self::Class2 f2a = #C2;
   self::expect(true, f2a is (core::int) → self::Class2);
   self::expect(false, f2a is (core::String) → self::Class2);
@@ -64,9 +64,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class2};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call(0);
+  dynamic c2b = f2b{dynamic}(0);
   self::expect(true, c2b is self::Class2);
-  self::throws(() → dynamic => f2b{dynamic}.call(""));
+  self::throws(() → dynamic => f2b{dynamic}(""));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.expect
index 5e943de942d..64c7a45d41b 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.expect
@@ -50,9 +50,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class1};
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call(0);
+  dynamic c1b = f1b{dynamic}(0);
   self::expect(true, c1b is self::Class1);
-  self::throws(() → dynamic => f1b{dynamic}.call(""));
+  self::throws(() → dynamic => f1b{dynamic}(""));
   (core::int) → self::Class2 f2a = #C2;
   self::expect(true, f2a is (core::int) → self::Class2);
   self::expect(false, f2a is (core::String) → self::Class2);
@@ -64,9 +64,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class2};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call(0);
+  dynamic c2b = f2b{dynamic}(0);
   self::expect(true, c2b is self::Class2);
-  self::throws(() → dynamic => f2b{dynamic}.call(""));
+  self::throws(() → dynamic => f2b{dynamic}(""));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.modular.expect
index 5e943de942d..64c7a45d41b 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.modular.expect
@@ -50,9 +50,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class1};
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call(0);
+  dynamic c1b = f1b{dynamic}(0);
   self::expect(true, c1b is self::Class1);
-  self::throws(() → dynamic => f1b{dynamic}.call(""));
+  self::throws(() → dynamic => f1b{dynamic}(""));
   (core::int) → self::Class2 f2a = #C2;
   self::expect(true, f2a is (core::int) → self::Class2);
   self::expect(false, f2a is (core::String) → self::Class2);
@@ -64,9 +64,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class2};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call(0);
+  dynamic c2b = f2b{dynamic}(0);
   self::expect(true, c2b is self::Class2);
-  self::throws(() → dynamic => f2b{dynamic}.call(""));
+  self::throws(() → dynamic => f2b{dynamic}(""));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.transformed.expect
index 0ef266f254a..f0f964f54f4 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/inferred_constructor_tear_off.dart.weak.transformed.expect
@@ -50,9 +50,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class1};
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call(0);
+  dynamic c1b = f1b{dynamic}(0);
   self::expect(true, c1b is self::Class1);
-  self::throws(() → dynamic => f1b{dynamic}.call(""));
+  self::throws(() → dynamic => f1b{dynamic}(""));
   (core::int) → self::Class2 f2a = #C2;
   self::expect(true, f2a is (core::int) → self::Class2);
   self::expect(false, f2a is (core::String) → self::Class2);
@@ -64,9 +64,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class2};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call(0);
+  dynamic c2b = f2b{dynamic}(0);
   self::expect(true, c2b is self::Class2);
-  self::throws(() → dynamic => f2b{dynamic}.call(""));
+  self::throws(() → dynamic => f2b{dynamic}(""));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.strong.expect
index 5a6ade9b991..7ab2d3b87b1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.strong.expect
@@ -105,14 +105,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -130,10 +130,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -146,7 +146,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -164,8 +164,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -195,10 +195,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.strong.transformed.expect
index 9fb9b4439eb..14465d8377a 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.strong.transformed.expect
@@ -105,14 +105,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -130,10 +130,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -146,7 +146,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -164,8 +164,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -195,10 +195,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.expect
index 5a6ade9b991..7ab2d3b87b1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.expect
@@ -105,14 +105,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -130,10 +130,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -146,7 +146,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -164,8 +164,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -195,10 +195,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.modular.expect
index 5a6ade9b991..7ab2d3b87b1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.modular.expect
@@ -105,14 +105,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -130,10 +130,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -146,7 +146,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -164,8 +164,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -195,10 +195,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.transformed.expect
index 9fb9b4439eb..14465d8377a 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off.dart.weak.transformed.expect
@@ -105,14 +105,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -130,10 +130,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -146,7 +146,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -164,8 +164,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -195,10 +195,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.strong.expect
index 7dcbebd9054..c1671608ef8 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.strong.expect
@@ -49,11 +49,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -66,11 +66,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.strong.transformed.expect
index 11ffceeba5f..ff2f9b0d5fa 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.strong.transformed.expect
@@ -49,11 +49,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -66,11 +66,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.expect
index 7dcbebd9054..c1671608ef8 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.expect
@@ -49,11 +49,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -66,11 +66,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.modular.expect
index 7dcbebd9054..c1671608ef8 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.modular.expect
@@ -49,11 +49,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -66,11 +66,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.transformed.expect
index 11ffceeba5f..ff2f9b0d5fa 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/constructor_tear_off_default_values.dart.weak.transformed.expect
@@ -49,11 +49,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -66,11 +66,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.strong.expect
index 9166036c25b..71202bae201 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.strong.expect
@@ -129,14 +129,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -154,10 +154,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -170,7 +170,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -188,8 +188,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -219,10 +219,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.strong.transformed.expect
index 9dcca2b280c..460085be6d7 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.strong.transformed.expect
@@ -129,14 +129,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -154,10 +154,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -170,7 +170,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -188,8 +188,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -219,10 +219,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.expect
index 9166036c25b..71202bae201 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.expect
@@ -129,14 +129,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -154,10 +154,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -170,7 +170,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -188,8 +188,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -219,10 +219,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.modular.expect
index 9166036c25b..71202bae201 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.modular.expect
@@ -129,14 +129,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -154,10 +154,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -170,7 +170,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -188,8 +188,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -219,10 +219,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.transformed.expect
index 9dcca2b280c..460085be6d7 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off.dart.weak.transformed.expect
@@ -129,14 +129,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -154,10 +154,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -170,7 +170,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -188,8 +188,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -219,10 +219,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.strong.expect
index a371dccf7c4..03e31a10978 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.strong.expect
@@ -57,11 +57,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -74,11 +74,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.strong.transformed.expect
index dc506b2c154..506dea8c980 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.strong.transformed.expect
@@ -57,11 +57,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -74,11 +74,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.expect
index a371dccf7c4..03e31a10978 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.expect
@@ -57,11 +57,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -74,11 +74,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.modular.expect
index a371dccf7c4..03e31a10978 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.modular.expect
@@ -57,11 +57,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -74,11 +74,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.transformed.expect
index dc506b2c154..506dea8c980 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/factory_tear_off_default_values.dart.weak.transformed.expect
@@ -57,11 +57,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -74,11 +74,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.strong.expect
index 253c4dc0526..15f860e6fb8 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.strong.expect
@@ -48,21 +48,21 @@ static method main() → dynamic {
   mai::Class1 c1a = f1a(){() → mai::Class1};
   self::expect(true, c1a is mai::Class1);
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is mai::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → mai::Class2 f2a = #C2;
   mai::Class2 c2a = f2a(){() → mai::Class2};
   self::expect(true, c2a is mai::Class2);
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is mai::Class2);
   self::expect(true, core::identical(f2a, f2b));
   () → mai::Class2 f2c = #C3;
   mai::Class2 c2c = f2c(){() → mai::Class2};
   self::expect(true, c2c is mai::Class2);
   dynamic f2d = #C3;
-  dynamic c2d = f2d{dynamic}.call();
+  dynamic c2d = f2d{dynamic}();
   self::expect(true, c2d is mai::Class2);
   self::expect(true, core::identical(f2c, f2d));
   (core::int) → mai::Class3 f3a = #C4;
@@ -78,10 +78,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   <T extends core::Object? = dynamic>() → mai::Class4<T%> f4a = #C5;
   mai::Class4<dynamic> c4a = f4a<dynamic>(){() → mai::Class4<dynamic>};
   self::expect(true, c4a is mai::Class4<dynamic>);
@@ -104,10 +104,10 @@ Try removing the extra positional arguments.
        ^" in f4b{<inapplicable>}.<core::int>();
   };
   dynamic f4c = #C5;
-  dynamic c4d = f4c{dynamic}.call();
+  dynamic c4d = f4c{dynamic}();
   self::expect(true, c4d is mai::Class4<dynamic>);
   self::expect(false, c4d is mai::Class4<core::int>);
-  self::throws(() → dynamic => f4c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f4c{dynamic}<core::int, core::String>());
   <T extends core::Object? = dynamic>() → mai::Class4<T%> f4d = #C6;
   mai::Class4<dynamic> c4e = f4d<dynamic>(){() → mai::Class4<dynamic>};
   self::expect(true, c4e is mai::Class4<dynamic>);
@@ -130,10 +130,10 @@ Try removing the extra positional arguments.
        ^" in f4e{<inapplicable>}.<core::int>();
   };
   dynamic f4f = #C6;
-  dynamic c4h = f4f{dynamic}.call();
+  dynamic c4h = f4f{dynamic}();
   self::expect(true, c4h is mai::Class4<dynamic>);
   self::expect(false, c4h is mai::Class4<core::int>);
-  self::throws(() → dynamic => f4f{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f4f{dynamic}<core::int, core::String>());
   <T extends core::num>() → mai::Class5<T> f5a = #C7;
   mai::Class5<core::num> c5a = f5a<core::num>(){() → mai::Class5<core::num>};
   self::expect(true, c5a is mai::Class5<core::num>);
@@ -148,14 +148,14 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f5b = #C7;
-  dynamic c5c = f5b{dynamic}.call();
+  dynamic c5c = f5b{dynamic}();
   self::expect(true, c5c is mai::Class5<core::num>);
   self::expect(false, c5c is mai::Class5<core::int>);
-  dynamic c5d = f5b{dynamic}.call<core::int>();
+  dynamic c5d = f5b{dynamic}<core::int>();
   self::expect(true, c5d is mai::Class5<core::int>);
   self::expect(false, c5d is mai::Class5<core::double>);
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::int, core::String>());
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.strong.transformed.expect
index c103be9cb0c..1666b2bda30 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.strong.transformed.expect
@@ -48,21 +48,21 @@ static method main() → dynamic {
   mai::Class1 c1a = f1a(){() → mai::Class1};
   self::expect(true, c1a is mai::Class1);
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is mai::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → mai::Class2 f2a = #C2;
   mai::Class2 c2a = f2a(){() → mai::Class2};
   self::expect(true, c2a is mai::Class2);
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is mai::Class2);
   self::expect(true, core::identical(f2a, f2b));
   () → mai::Class2 f2c = #C3;
   mai::Class2 c2c = f2c(){() → mai::Class2};
   self::expect(true, c2c is mai::Class2);
   dynamic f2d = #C3;
-  dynamic c2d = f2d{dynamic}.call();
+  dynamic c2d = f2d{dynamic}();
   self::expect(true, c2d is mai::Class2);
   self::expect(true, core::identical(f2c, f2d));
   (core::int) → mai::Class3 f3a = #C4;
@@ -78,10 +78,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   <T extends core::Object? = dynamic>() → mai::Class4<T%> f4a = #C5;
   mai::Class4<dynamic> c4a = f4a<dynamic>(){() → mai::Class4<dynamic>};
   self::expect(true, c4a is mai::Class4<dynamic>);
@@ -104,10 +104,10 @@ Try removing the extra positional arguments.
        ^" in f4b{<inapplicable>}.<core::int>();
   };
   dynamic f4c = #C5;
-  dynamic c4d = f4c{dynamic}.call();
+  dynamic c4d = f4c{dynamic}();
   self::expect(true, c4d is mai::Class4<dynamic>);
   self::expect(false, c4d is mai::Class4<core::int>);
-  self::throws(() → dynamic => f4c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f4c{dynamic}<core::int, core::String>());
   <T extends core::Object? = dynamic>() → mai::Class4<T%> f4d = #C6;
   mai::Class4<dynamic> c4e = f4d<dynamic>(){() → mai::Class4<dynamic>};
   self::expect(true, c4e is mai::Class4<dynamic>);
@@ -130,10 +130,10 @@ Try removing the extra positional arguments.
        ^" in f4e{<inapplicable>}.<core::int>();
   };
   dynamic f4f = #C6;
-  dynamic c4h = f4f{dynamic}.call();
+  dynamic c4h = f4f{dynamic}();
   self::expect(true, c4h is mai::Class4<dynamic>);
   self::expect(false, c4h is mai::Class4<core::int>);
-  self::throws(() → dynamic => f4f{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f4f{dynamic}<core::int, core::String>());
   <T extends core::num>() → mai::Class5<T> f5a = #C7;
   mai::Class5<core::num> c5a = f5a<core::num>(){() → mai::Class5<core::num>};
   self::expect(true, c5a is mai::Class5<core::num>);
@@ -148,14 +148,14 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f5b = #C7;
-  dynamic c5c = f5b{dynamic}.call();
+  dynamic c5c = f5b{dynamic}();
   self::expect(true, c5c is mai::Class5<core::num>);
   self::expect(false, c5c is mai::Class5<core::int>);
-  dynamic c5d = f5b{dynamic}.call<core::int>();
+  dynamic c5d = f5b{dynamic}<core::int>();
   self::expect(true, c5d is mai::Class5<core::int>);
   self::expect(false, c5d is mai::Class5<core::double>);
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::int, core::String>());
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.expect
index 253c4dc0526..15f860e6fb8 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.expect
@@ -48,21 +48,21 @@ static method main() → dynamic {
   mai::Class1 c1a = f1a(){() → mai::Class1};
   self::expect(true, c1a is mai::Class1);
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is mai::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → mai::Class2 f2a = #C2;
   mai::Class2 c2a = f2a(){() → mai::Class2};
   self::expect(true, c2a is mai::Class2);
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is mai::Class2);
   self::expect(true, core::identical(f2a, f2b));
   () → mai::Class2 f2c = #C3;
   mai::Class2 c2c = f2c(){() → mai::Class2};
   self::expect(true, c2c is mai::Class2);
   dynamic f2d = #C3;
-  dynamic c2d = f2d{dynamic}.call();
+  dynamic c2d = f2d{dynamic}();
   self::expect(true, c2d is mai::Class2);
   self::expect(true, core::identical(f2c, f2d));
   (core::int) → mai::Class3 f3a = #C4;
@@ -78,10 +78,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   <T extends core::Object? = dynamic>() → mai::Class4<T%> f4a = #C5;
   mai::Class4<dynamic> c4a = f4a<dynamic>(){() → mai::Class4<dynamic>};
   self::expect(true, c4a is mai::Class4<dynamic>);
@@ -104,10 +104,10 @@ Try removing the extra positional arguments.
        ^" in f4b{<inapplicable>}.<core::int>();
   };
   dynamic f4c = #C5;
-  dynamic c4d = f4c{dynamic}.call();
+  dynamic c4d = f4c{dynamic}();
   self::expect(true, c4d is mai::Class4<dynamic>);
   self::expect(false, c4d is mai::Class4<core::int>);
-  self::throws(() → dynamic => f4c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f4c{dynamic}<core::int, core::String>());
   <T extends core::Object? = dynamic>() → mai::Class4<T%> f4d = #C6;
   mai::Class4<dynamic> c4e = f4d<dynamic>(){() → mai::Class4<dynamic>};
   self::expect(true, c4e is mai::Class4<dynamic>);
@@ -130,10 +130,10 @@ Try removing the extra positional arguments.
        ^" in f4e{<inapplicable>}.<core::int>();
   };
   dynamic f4f = #C6;
-  dynamic c4h = f4f{dynamic}.call();
+  dynamic c4h = f4f{dynamic}();
   self::expect(true, c4h is mai::Class4<dynamic>);
   self::expect(false, c4h is mai::Class4<core::int>);
-  self::throws(() → dynamic => f4f{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f4f{dynamic}<core::int, core::String>());
   <T extends core::num>() → mai::Class5<T> f5a = #C7;
   mai::Class5<core::num> c5a = f5a<core::num>(){() → mai::Class5<core::num>};
   self::expect(true, c5a is mai::Class5<core::num>);
@@ -148,14 +148,14 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f5b = #C7;
-  dynamic c5c = f5b{dynamic}.call();
+  dynamic c5c = f5b{dynamic}();
   self::expect(true, c5c is mai::Class5<core::num>);
   self::expect(false, c5c is mai::Class5<core::int>);
-  dynamic c5d = f5b{dynamic}.call<core::int>();
+  dynamic c5d = f5b{dynamic}<core::int>();
   self::expect(true, c5d is mai::Class5<core::int>);
   self::expect(false, c5d is mai::Class5<core::double>);
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::int, core::String>());
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.modular.expect
index bf875452a74..47099596e28 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.modular.expect
@@ -48,21 +48,21 @@ static method main() → dynamic {
   mai::Class1 c1a = f1a(){() → mai::Class1};
   self::expect(true, c1a is mai::Class1);
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is mai::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → mai::Class2 f2a = #C2;
   mai::Class2 c2a = f2a(){() → mai::Class2};
   self::expect(true, c2a is mai::Class2);
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is mai::Class2);
   self::expect(true, core::identical(f2a, f2b));
   () → mai::Class2 f2c = #C3;
   mai::Class2 c2c = f2c(){() → mai::Class2};
   self::expect(true, c2c is mai::Class2);
   dynamic f2d = #C3;
-  dynamic c2d = f2d{dynamic}.call();
+  dynamic c2d = f2d{dynamic}();
   self::expect(true, c2d is mai::Class2);
   self::expect(true, core::identical(f2c, f2d));
   (core::int) → mai::Class3 f3a = #C4;
@@ -78,10 +78,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   <T extends core::Object? = dynamic>() → mai::Class4<T%> f4a = #C5;
   mai::Class4<dynamic> c4a = f4a<dynamic>(){() → mai::Class4<dynamic>};
   self::expect(true, c4a is mai::Class4<dynamic>);
@@ -104,10 +104,10 @@ Try removing the extra positional arguments.
        ^" in f4b{<inapplicable>}.<core::int>();
   };
   dynamic f4c = #C5;
-  dynamic c4d = f4c{dynamic}.call();
+  dynamic c4d = f4c{dynamic}();
   self::expect(true, c4d is mai::Class4<dynamic>);
   self::expect(false, c4d is mai::Class4<core::int>);
-  self::throws(() → dynamic => f4c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f4c{dynamic}<core::int, core::String>());
   <T extends core::Object? = dynamic>() → mai::Class4<T%> f4d = #C6;
   mai::Class4<dynamic> c4e = f4d<dynamic>(){() → mai::Class4<dynamic>};
   self::expect(true, c4e is mai::Class4<dynamic>);
@@ -130,10 +130,10 @@ Try removing the extra positional arguments.
        ^" in f4e{<inapplicable>}.<core::int>();
   };
   dynamic f4f = #C6;
-  dynamic c4h = f4f{dynamic}.call();
+  dynamic c4h = f4f{dynamic}();
   self::expect(true, c4h is mai::Class4<dynamic>);
   self::expect(false, c4h is mai::Class4<core::int>);
-  self::throws(() → dynamic => f4f{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f4f{dynamic}<core::int, core::String>());
   <T extends core::num>() → mai::Class5<T> f5a = #C7;
   mai::Class5<core::num> c5a = f5a<core::num>(){() → mai::Class5<core::num>};
   self::expect(true, c5a is mai::Class5<core::num>);
@@ -148,14 +148,14 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f5b = #C7;
-  dynamic c5c = f5b{dynamic}.call();
+  dynamic c5c = f5b{dynamic}();
   self::expect(true, c5c is mai::Class5<core::num>);
   self::expect(false, c5c is mai::Class5<core::int>);
-  dynamic c5d = f5b{dynamic}.call<core::int>();
+  dynamic c5d = f5b{dynamic}<core::int>();
   self::expect(true, c5d is mai::Class5<core::int>);
   self::expect(false, c5d is mai::Class5<core::double>);
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::int, core::String>());
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.transformed.expect
index c103be9cb0c..1666b2bda30 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/from_dill/main.dart.weak.transformed.expect
@@ -48,21 +48,21 @@ static method main() → dynamic {
   mai::Class1 c1a = f1a(){() → mai::Class1};
   self::expect(true, c1a is mai::Class1);
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is mai::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → mai::Class2 f2a = #C2;
   mai::Class2 c2a = f2a(){() → mai::Class2};
   self::expect(true, c2a is mai::Class2);
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is mai::Class2);
   self::expect(true, core::identical(f2a, f2b));
   () → mai::Class2 f2c = #C3;
   mai::Class2 c2c = f2c(){() → mai::Class2};
   self::expect(true, c2c is mai::Class2);
   dynamic f2d = #C3;
-  dynamic c2d = f2d{dynamic}.call();
+  dynamic c2d = f2d{dynamic}();
   self::expect(true, c2d is mai::Class2);
   self::expect(true, core::identical(f2c, f2d));
   (core::int) → mai::Class3 f3a = #C4;
@@ -78,10 +78,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   <T extends core::Object? = dynamic>() → mai::Class4<T%> f4a = #C5;
   mai::Class4<dynamic> c4a = f4a<dynamic>(){() → mai::Class4<dynamic>};
   self::expect(true, c4a is mai::Class4<dynamic>);
@@ -104,10 +104,10 @@ Try removing the extra positional arguments.
        ^" in f4b{<inapplicable>}.<core::int>();
   };
   dynamic f4c = #C5;
-  dynamic c4d = f4c{dynamic}.call();
+  dynamic c4d = f4c{dynamic}();
   self::expect(true, c4d is mai::Class4<dynamic>);
   self::expect(false, c4d is mai::Class4<core::int>);
-  self::throws(() → dynamic => f4c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f4c{dynamic}<core::int, core::String>());
   <T extends core::Object? = dynamic>() → mai::Class4<T%> f4d = #C6;
   mai::Class4<dynamic> c4e = f4d<dynamic>(){() → mai::Class4<dynamic>};
   self::expect(true, c4e is mai::Class4<dynamic>);
@@ -130,10 +130,10 @@ Try removing the extra positional arguments.
        ^" in f4e{<inapplicable>}.<core::int>();
   };
   dynamic f4f = #C6;
-  dynamic c4h = f4f{dynamic}.call();
+  dynamic c4h = f4f{dynamic}();
   self::expect(true, c4h is mai::Class4<dynamic>);
   self::expect(false, c4h is mai::Class4<core::int>);
-  self::throws(() → dynamic => f4f{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f4f{dynamic}<core::int, core::String>());
   <T extends core::num>() → mai::Class5<T> f5a = #C7;
   mai::Class5<core::num> c5a = f5a<core::num>(){() → mai::Class5<core::num>};
   self::expect(true, c5a is mai::Class5<core::num>);
@@ -148,14 +148,14 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f5b = #C7;
-  dynamic c5c = f5b{dynamic}.call();
+  dynamic c5c = f5b{dynamic}();
   self::expect(true, c5c is mai::Class5<core::num>);
   self::expect(false, c5c is mai::Class5<core::int>);
-  dynamic c5d = f5b{dynamic}.call<core::int>();
+  dynamic c5d = f5b{dynamic}<core::int>();
   self::expect(true, c5d is mai::Class5<core::int>);
   self::expect(false, c5d is mai::Class5<core::double>);
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::int, core::String>());
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.strong.expect
index 078fac2bc4b..38b0ccd8209 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.strong.expect
@@ -98,10 +98,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -118,14 +118,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -137,20 +137,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.strong.transformed.expect
index d7ce8203862..5c55617cffb 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.strong.transformed.expect
@@ -98,10 +98,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -118,14 +118,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -137,20 +137,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.expect
index 078fac2bc4b..38b0ccd8209 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.expect
@@ -98,10 +98,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -118,14 +118,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -137,20 +137,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.modular.expect
index 078fac2bc4b..38b0ccd8209 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.modular.expect
@@ -98,10 +98,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -118,14 +118,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -137,20 +137,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.transformed.expect
index d7ce8203862..5c55617cffb 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_constructor_tear_off.dart.weak.transformed.expect
@@ -98,10 +98,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -118,14 +118,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -137,20 +137,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.strong.expect
index 43d6ccfe06a..437c6d5607c 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.strong.expect
@@ -118,10 +118,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -138,14 +138,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -157,20 +157,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.strong.transformed.expect
index 7ad0ecfd1f1..6ba9b55b3f5 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.strong.transformed.expect
@@ -118,10 +118,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -138,14 +138,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -157,20 +157,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.expect
index 43d6ccfe06a..437c6d5607c 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.expect
@@ -118,10 +118,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -138,14 +138,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -157,20 +157,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.modular.expect
index 43d6ccfe06a..437c6d5607c 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.modular.expect
@@ -118,10 +118,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -138,14 +138,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -157,20 +157,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.transformed.expect
index 7ad0ecfd1f1..6ba9b55b3f5 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_factory_tear_off.dart.weak.transformed.expect
@@ -118,10 +118,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -138,14 +138,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -157,20 +157,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.strong.expect
index d4d6788125a..4fce1fa988d 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.strong.expect
@@ -118,10 +118,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -138,14 +138,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -157,20 +157,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.strong.transformed.expect
index bc35ea62d19..03b40a17c5a 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.strong.transformed.expect
@@ -118,10 +118,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -138,14 +138,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -157,20 +157,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.expect
index d4d6788125a..4fce1fa988d 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.expect
@@ -118,10 +118,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -138,14 +138,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -157,20 +157,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.modular.expect
index d4d6788125a..4fce1fa988d 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.modular.expect
@@ -118,10 +118,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -138,14 +138,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -157,20 +157,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.transformed.expect
index bc35ea62d19..03b40a17c5a 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/generic_redirecting_factory_tear_off.dart.weak.transformed.expect
@@ -118,10 +118,10 @@ static method testGeneric() → dynamic {
        ^" in f1b{<inapplicable>}.<core::int>();
   };
   dynamic f1c = #C1;
-  dynamic c1d = f1c{dynamic}.call();
+  dynamic c1d = f1c{dynamic}();
   self::expect(true, c1a is self::Class1<dynamic>);
   self::expect(false, c1a is self::Class1<core::int>);
-  self::throws(() → dynamic => f1c{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f1c{dynamic}<core::int, core::String>());
 }
 static method testBounded() → dynamic {
   <T extends core::num>() → self::Class2<T> f2a = #C2;
@@ -138,14 +138,14 @@ static method testBounded() → dynamic {
        ^" in f2a{<inapplicable>}.<core::int, core::String>();
   };
   dynamic f2b = #C2;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(true, c2c is self::Class2<core::num>);
   self::expect(false, c2c is self::Class2<core::int>);
-  dynamic c2d = f2b{dynamic}.call<core::int>();
+  dynamic c2d = f2b{dynamic}<core::int>();
   self::expect(true, c2d is self::Class2<core::int>);
   self::expect(false, c2d is self::Class2<core::double>);
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f2b{dynamic}.call<core::int, core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}<core::int, core::String>());
   <T extends S% = dynamic, S extends core::Object? = dynamic>() → self::Class3<T%, S%> f3a = #C3;
   self::Class3<dynamic, dynamic> c3a = f3a<dynamic, dynamic>(){() → self::Class3<dynamic, dynamic>};
   self::expect(true, c3a is self::Class3<dynamic, dynamic>);
@@ -157,20 +157,20 @@ static method testBounded() → dynamic {
     f3a<core::num, core::int>(){() → self::Class3<core::num, core::int>};
   };
   dynamic f3b = #C3;
-  dynamic c3c = f3b{dynamic}.call();
+  dynamic c3c = f3b{dynamic}();
   self::expect(true, c3c is self::Class3<dynamic, dynamic>);
   self::expect(false, c3c is self::Class3<core::int, core::num>);
-  dynamic c3d = f3b{dynamic}.call<core::int, core::num>();
+  dynamic c3d = f3b{dynamic}<core::int, core::num>();
   self::expect(true, c3d is self::Class3<core::int, core::num>);
   self::expect(false, c3d is self::Class3<core::double, core::num>);
-  self::throws(() → dynamic => f3b{dynamic}.call<core::num, core::int>());
+  self::throws(() → dynamic => f3b{dynamic}<core::num, core::int>());
   <T extends self::Class4<T> = self::Class4<dynamic>>() → self::Class4<T> f4a = #C4;
   () → Null {
     self::Class4<self::Class4<core::Object?>> c4a = f4a<self::Class4<core::Object?>>(){() → self::Class4<self::Class4<core::Object?>>};
   };
   dynamic f4b = #C4;
-  self::throws(() → dynamic => f4b{dynamic}.call());
-  dynamic c4b = f4b{dynamic}.call<self::Class4int>();
+  self::throws(() → dynamic => f4b{dynamic}());
+  dynamic c4b = f4b{dynamic}<self::Class4int>();
   self::expect(true, c4b is self::Class4<self::Class4int>);
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.strong.expect
index 3eb47760e94..662f07a4ab1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.strong.expect
@@ -54,9 +54,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class1};
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call(0);
+  dynamic c1b = f1b{dynamic}(0);
   self::expect(true, c1b is self::Class1);
-  self::throws(() → dynamic => f1b{dynamic}.call(""));
+  self::throws(() → dynamic => f1b{dynamic}(""));
   (core::int) → self::Class2 f2a = #C2;
   self::expect(true, f2a is (core::int) → self::Class2);
   self::expect(false, f2a is (core::String) → self::Class2);
@@ -68,9 +68,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class2};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call(0);
+  dynamic c2b = f2b{dynamic}(0);
   self::expect(true, c2b is self::Class2);
-  self::throws(() → dynamic => f2b{dynamic}.call(""));
+  self::throws(() → dynamic => f2b{dynamic}(""));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.strong.transformed.expect
index 91bc39b81d5..7d0957eb641 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.strong.transformed.expect
@@ -54,9 +54,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class1};
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call(0);
+  dynamic c1b = f1b{dynamic}(0);
   self::expect(true, c1b is self::Class1);
-  self::throws(() → dynamic => f1b{dynamic}.call(""));
+  self::throws(() → dynamic => f1b{dynamic}(""));
   (core::int) → self::Class2 f2a = #C2;
   self::expect(true, f2a is (core::int) → self::Class2);
   self::expect(false, f2a is (core::String) → self::Class2);
@@ -68,9 +68,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class2};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call(0);
+  dynamic c2b = f2b{dynamic}(0);
   self::expect(true, c2b is self::Class2);
-  self::throws(() → dynamic => f2b{dynamic}.call(""));
+  self::throws(() → dynamic => f2b{dynamic}(""));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.expect
index 3eb47760e94..662f07a4ab1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.expect
@@ -54,9 +54,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class1};
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call(0);
+  dynamic c1b = f1b{dynamic}(0);
   self::expect(true, c1b is self::Class1);
-  self::throws(() → dynamic => f1b{dynamic}.call(""));
+  self::throws(() → dynamic => f1b{dynamic}(""));
   (core::int) → self::Class2 f2a = #C2;
   self::expect(true, f2a is (core::int) → self::Class2);
   self::expect(false, f2a is (core::String) → self::Class2);
@@ -68,9 +68,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class2};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call(0);
+  dynamic c2b = f2b{dynamic}(0);
   self::expect(true, c2b is self::Class2);
-  self::throws(() → dynamic => f2b{dynamic}.call(""));
+  self::throws(() → dynamic => f2b{dynamic}(""));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.modular.expect
index 3eb47760e94..662f07a4ab1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.modular.expect
@@ -54,9 +54,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class1};
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call(0);
+  dynamic c1b = f1b{dynamic}(0);
   self::expect(true, c1b is self::Class1);
-  self::throws(() → dynamic => f1b{dynamic}.call(""));
+  self::throws(() → dynamic => f1b{dynamic}(""));
   (core::int) → self::Class2 f2a = #C2;
   self::expect(true, f2a is (core::int) → self::Class2);
   self::expect(false, f2a is (core::String) → self::Class2);
@@ -68,9 +68,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class2};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call(0);
+  dynamic c2b = f2b{dynamic}(0);
   self::expect(true, c2b is self::Class2);
-  self::throws(() → dynamic => f2b{dynamic}.call(""));
+  self::throws(() → dynamic => f2b{dynamic}(""));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.transformed.expect
index 91bc39b81d5..7d0957eb641 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/inferred_constructor_tear_off.dart.weak.transformed.expect
@@ -54,9 +54,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class1};
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call(0);
+  dynamic c1b = f1b{dynamic}(0);
   self::expect(true, c1b is self::Class1);
-  self::throws(() → dynamic => f1b{dynamic}.call(""));
+  self::throws(() → dynamic => f1b{dynamic}(""));
   (core::int) → self::Class2 f2a = #C2;
   self::expect(true, f2a is (core::int) → self::Class2);
   self::expect(false, f2a is (core::String) → self::Class2);
@@ -68,9 +68,9 @@ static method testInferred() → dynamic {
         ^" in "" as{TypeError} core::int){(core::int) → self::Class2};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call(0);
+  dynamic c2b = f2b{dynamic}(0);
   self::expect(true, c2b is self::Class2);
-  self::throws(() → dynamic => f2b{dynamic}.call(""));
+  self::throws(() → dynamic => f2b{dynamic}(""));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.strong.expect
index c4db5bf813b..75e2eeaf345 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.strong.expect
@@ -167,14 +167,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -192,10 +192,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -208,7 +208,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -226,8 +226,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -257,10 +257,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
   () → self::Class7b f7a = #C8;
   self::Class7b c7a = f7a(){() → self::Class7b};
   self::expect(true, c7a is self::Class7a);
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.strong.transformed.expect
index 94f2b41c306..61bd3fdf728 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.strong.transformed.expect
@@ -167,14 +167,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -192,10 +192,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -208,7 +208,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -226,8 +226,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -257,10 +257,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
   () → self::Class7b f7a = #C8;
   self::Class7b c7a = f7a(){() → self::Class7b};
   self::expect(true, c7a is self::Class7a);
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.expect
index c4db5bf813b..75e2eeaf345 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.expect
@@ -167,14 +167,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -192,10 +192,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -208,7 +208,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -226,8 +226,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -257,10 +257,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
   () → self::Class7b f7a = #C8;
   self::Class7b c7a = f7a(){() → self::Class7b};
   self::expect(true, c7a is self::Class7a);
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.modular.expect
index c4db5bf813b..75e2eeaf345 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.modular.expect
@@ -167,14 +167,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -192,10 +192,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -208,7 +208,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -226,8 +226,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -257,10 +257,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
   () → self::Class7b f7a = #C8;
   self::Class7b c7a = f7a(){() → self::Class7b};
   self::expect(true, c7a is self::Class7a);
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.transformed.expect
index 94f2b41c306..61bd3fdf728 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off.dart.weak.transformed.expect
@@ -167,14 +167,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -192,10 +192,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -208,7 +208,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -226,8 +226,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -257,10 +257,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
   () → self::Class7b f7a = #C8;
   self::Class7b c7a = f7a(){() → self::Class7b};
   self::expect(true, c7a is self::Class7a);
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.strong.expect
index 14f42e2b41e..0c55ccb6a75 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.strong.expect
@@ -57,11 +57,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -74,11 +74,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.strong.transformed.expect
index d39e737be1f..59d81ac8a95 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.strong.transformed.expect
@@ -57,11 +57,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -74,11 +74,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.expect
index 14f42e2b41e..0c55ccb6a75 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.expect
@@ -57,11 +57,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -74,11 +74,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.modular.expect
index 14f42e2b41e..0c55ccb6a75 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.modular.expect
@@ -57,11 +57,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -74,11 +74,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.transformed.expect
index d39e737be1f..59d81ac8a95 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/redirecting_factory_tear_off_default_values.dart.weak.transformed.expect
@@ -57,11 +57,11 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(42, 87);
   };
   dynamic f1b = #C2;
-  dynamic c1c = f1b{dynamic}.call();
+  dynamic c1c = f1b{dynamic}();
   self::expect(42, c1c{dynamic}.field);
-  dynamic c1d = f1b{dynamic}.call(87);
+  dynamic c1d = f1b{dynamic}(87);
   self::expect(87, c1d{dynamic}.field);
-  self::throws(() → dynamic => f1b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f1b{dynamic}(42, 87));
   ({field: core::int}) → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){({field: core::int}) → self::Class2};
   self::expect(42, c2a.{self::Class2::field}{core::int});
@@ -74,11 +74,11 @@ Try removing the extra positional arguments.
        ^" in f2a{<inapplicable>}.(87);
   };
   dynamic f2b = #C3;
-  dynamic c2c = f2b{dynamic}.call();
+  dynamic c2c = f2b{dynamic}();
   self::expect(42, c2c{dynamic}.field);
-  dynamic c2d = f2b{dynamic}.call(field: 87);
+  dynamic c2d = f2b{dynamic}(field: 87);
   self::expect(87, c2d{dynamic}.field);
-  self::throws(() → dynamic => f2b{dynamic}.call(87));
+  self::throws(() → dynamic => f2b{dynamic}(87));
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.strong.expect
index 9c02f2319f7..679d8595d44 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.strong.expect
@@ -130,9 +130,9 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(0);
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::A);
-  self::throws(() → dynamic => f1b{dynamic}.call(0));
+  self::throws(() → dynamic => f1b{dynamic}(0));
   <unrelated X extends core::num>() → self::A f2a = #C2;
   self::A c2a = f2a<core::num>(){() → self::A};
   self::expect(true, c2a is self::A);
@@ -144,12 +144,12 @@ Try removing the extra positional arguments.
     f2a<core::String>(){() → self::A};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::A);
-  dynamic c2c = f2b{dynamic}.call<core::int>();
+  dynamic c2c = f2b{dynamic}<core::int>();
   self::expect(true, c2c is self::A);
-  self::throws(() → dynamic => f2b{dynamic}.call(0));
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}(0));
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
   () → self::B<core::String> f3a = #C4;
   self::B<core::String> c3a = f3a(){() → self::B<core::String>};
   self::expect(true, c3a is self::B<core::String>);
@@ -166,13 +166,13 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.<core::String>();
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call();
+  dynamic c3b = f3b{dynamic}();
   self::expect(true, c3b is self::B<core::String>);
   self::expect(false, c3b is self::B<core::int>);
   self::expect(0, c3a.{self::B::field1}{core::int});
   self::expect("", c3a.{self::B::field2}{core::String});
-  self::throws(() → dynamic => f3b{dynamic}.call(0));
-  self::throws(() → dynamic => f3b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f3b{dynamic}(0));
+  self::throws(() → dynamic => f3b{dynamic}<core::String>());
   (core::int) → self::B<core::String> f3c = #C6;
   self::B<core::String> c3c = f3c(42){(core::int) → self::B<core::String>};
   self::expect(true, c3c is self::B<core::String>);
@@ -192,14 +192,14 @@ Try removing the extra positional arguments.
        ^" in f3c{<inapplicable>}.<core::String>(0);
   };
   dynamic f3d = #C6;
-  dynamic c3d = f3d{dynamic}.call(42);
+  dynamic c3d = f3d{dynamic}(42);
   self::expect(true, c3d is self::B<core::String>);
   self::expect(false, c3d is self::B<core::int>);
   self::expect(42, c3d{dynamic}.field1);
   self::expect("", c3d{dynamic}.field2);
-  self::throws(() → dynamic => f3d{dynamic}.call());
-  self::throws(() → dynamic => f3d{dynamic}.call(0, 0));
-  self::throws(() → dynamic => f3d{dynamic}.call<core::String>(0));
+  self::throws(() → dynamic => f3d{dynamic}());
+  self::throws(() → dynamic => f3d{dynamic}(0, 0));
+  self::throws(() → dynamic => f3d{dynamic}<core::String>(0));
   (core::int, core::String) → self::B<core::String> f3e = #C8;
   self::B<core::String> c3e = f3e(42, "foo"){(core::int, core::String) → self::B<core::String>};
   self::expect(true, c3e is self::B<core::String>);
@@ -218,14 +218,14 @@ Try removing the extra positional arguments.
        ^" in f3e{<inapplicable>}.<core::String>(0, "");
   };
   dynamic f3f = #C8;
-  dynamic c3f = f3f{dynamic}.call(42, "foo");
+  dynamic c3f = f3f{dynamic}(42, "foo");
   self::expect(true, c3f is self::B<core::String>);
   self::expect(false, c3f is self::B<core::int>);
   self::expect(42, c3f{dynamic}.field1);
   self::expect("foo", c3f{dynamic}.field2);
-  self::throws(() → dynamic => c3f{dynamic}.call());
-  self::throws(() → dynamic => c3f{dynamic}.call(0));
-  self::throws(() → dynamic => c3f{dynamic}.call<core::String>(0));
+  self::throws(() → dynamic => c3f{dynamic}());
+  self::throws(() → dynamic => c3f{dynamic}(0));
+  self::throws(() → dynamic => c3f{dynamic}<core::String>(0));
   <X extends core::num>() → self::B<X> f4a = #C9;
   self::B<core::num> c4a = f4a<core::num>(){() → self::B<core::num>};
   self::expect(true, c4a is self::B<core::num>);
@@ -241,14 +241,14 @@ Try removing the extra positional arguments.
     f4a<core::String>(){() → self::B<core::String>};
   };
   dynamic f4b = #C9;
-  dynamic c4c = f4b{dynamic}.call();
+  dynamic c4c = f4b{dynamic}();
   self::expect(true, c4c is self::B<core::num>);
   self::expect(false, c4c is self::B<core::int>);
-  dynamic c4d = f4b{dynamic}.call<core::int>();
+  dynamic c4d = f4b{dynamic}<core::int>();
   self::expect(true, c4d is self::B<core::int>);
   self::expect(false, c4d is self::B<core::double>);
-  self::throws(() → dynamic => f4b{dynamic}.call(0));
-  self::throws(() → dynamic => f4b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f4b{dynamic}(0));
+  self::throws(() → dynamic => f4b{dynamic}<core::String>());
   <X extends core::num, unrelated Y extends core::String>() → self::B<X> f5a = #C10;
   self::B<core::num> c5a = f5a<core::num, core::String>(){() → self::B<core::num>};
   self::expect(true, c5a is self::B<core::num>);
@@ -268,16 +268,16 @@ Try removing the extra positional arguments.
     f5a<core::num, core::num>(){() → self::B<core::num>};
   };
   dynamic f5b = #C10;
-  dynamic c5c = f5b{dynamic}.call();
+  dynamic c5c = f5b{dynamic}();
   self::expect(true, c5c is self::B<core::num>);
   self::expect(false, c5c is self::B<core::int>);
-  dynamic c5d = f5b{dynamic}.call<core::int, core::String>();
+  dynamic c5d = f5b{dynamic}<core::int, core::String>();
   self::expect(true, c5d is self::B<core::int>);
   self::expect(false, c5d is self::B<core::double>);
-  self::throws(() → dynamic => f5b{dynamic}.call(0));
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String, core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::num, core::num>());
+  self::throws(() → dynamic => f5b{dynamic}(0));
+  self::throws(() → dynamic => f5b{dynamic}<core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::String, core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::num, core::num>());
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.strong.transformed.expect
index c8133f16226..08def23f197 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.strong.transformed.expect
@@ -130,9 +130,9 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(0);
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::A);
-  self::throws(() → dynamic => f1b{dynamic}.call(0));
+  self::throws(() → dynamic => f1b{dynamic}(0));
   <unrelated X extends core::num>() → self::A f2a = #C2;
   self::A c2a = f2a<core::num>(){() → self::A};
   self::expect(true, c2a is self::A);
@@ -144,12 +144,12 @@ Try removing the extra positional arguments.
     f2a<core::String>(){() → self::A};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::A);
-  dynamic c2c = f2b{dynamic}.call<core::int>();
+  dynamic c2c = f2b{dynamic}<core::int>();
   self::expect(true, c2c is self::A);
-  self::throws(() → dynamic => f2b{dynamic}.call(0));
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}(0));
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
   () → self::B<core::String> f3a = #C4;
   self::B<core::String> c3a = f3a(){() → self::B<core::String>};
   self::expect(true, c3a is self::B<core::String>);
@@ -166,13 +166,13 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.<core::String>();
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call();
+  dynamic c3b = f3b{dynamic}();
   self::expect(true, c3b is self::B<core::String>);
   self::expect(false, c3b is self::B<core::int>);
   self::expect(0, c3a.{self::B::field1}{core::int});
   self::expect("", c3a.{self::B::field2}{core::String});
-  self::throws(() → dynamic => f3b{dynamic}.call(0));
-  self::throws(() → dynamic => f3b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f3b{dynamic}(0));
+  self::throws(() → dynamic => f3b{dynamic}<core::String>());
   (core::int) → self::B<core::String> f3c = #C6;
   self::B<core::String> c3c = f3c(42){(core::int) → self::B<core::String>};
   self::expect(true, c3c is self::B<core::String>);
@@ -192,14 +192,14 @@ Try removing the extra positional arguments.
        ^" in f3c{<inapplicable>}.<core::String>(0);
   };
   dynamic f3d = #C6;
-  dynamic c3d = f3d{dynamic}.call(42);
+  dynamic c3d = f3d{dynamic}(42);
   self::expect(true, c3d is self::B<core::String>);
   self::expect(false, c3d is self::B<core::int>);
   self::expect(42, c3d{dynamic}.field1);
   self::expect("", c3d{dynamic}.field2);
-  self::throws(() → dynamic => f3d{dynamic}.call());
-  self::throws(() → dynamic => f3d{dynamic}.call(0, 0));
-  self::throws(() → dynamic => f3d{dynamic}.call<core::String>(0));
+  self::throws(() → dynamic => f3d{dynamic}());
+  self::throws(() → dynamic => f3d{dynamic}(0, 0));
+  self::throws(() → dynamic => f3d{dynamic}<core::String>(0));
   (core::int, core::String) → self::B<core::String> f3e = #C8;
   self::B<core::String> c3e = f3e(42, "foo"){(core::int, core::String) → self::B<core::String>};
   self::expect(true, c3e is self::B<core::String>);
@@ -218,14 +218,14 @@ Try removing the extra positional arguments.
        ^" in f3e{<inapplicable>}.<core::String>(0, "");
   };
   dynamic f3f = #C8;
-  dynamic c3f = f3f{dynamic}.call(42, "foo");
+  dynamic c3f = f3f{dynamic}(42, "foo");
   self::expect(true, c3f is self::B<core::String>);
   self::expect(false, c3f is self::B<core::int>);
   self::expect(42, c3f{dynamic}.field1);
   self::expect("foo", c3f{dynamic}.field2);
-  self::throws(() → dynamic => c3f{dynamic}.call());
-  self::throws(() → dynamic => c3f{dynamic}.call(0));
-  self::throws(() → dynamic => c3f{dynamic}.call<core::String>(0));
+  self::throws(() → dynamic => c3f{dynamic}());
+  self::throws(() → dynamic => c3f{dynamic}(0));
+  self::throws(() → dynamic => c3f{dynamic}<core::String>(0));
   <X extends core::num>() → self::B<X> f4a = #C9;
   self::B<core::num> c4a = f4a<core::num>(){() → self::B<core::num>};
   self::expect(true, c4a is self::B<core::num>);
@@ -241,14 +241,14 @@ Try removing the extra positional arguments.
     f4a<core::String>(){() → self::B<core::String>};
   };
   dynamic f4b = #C9;
-  dynamic c4c = f4b{dynamic}.call();
+  dynamic c4c = f4b{dynamic}();
   self::expect(true, c4c is self::B<core::num>);
   self::expect(false, c4c is self::B<core::int>);
-  dynamic c4d = f4b{dynamic}.call<core::int>();
+  dynamic c4d = f4b{dynamic}<core::int>();
   self::expect(true, c4d is self::B<core::int>);
   self::expect(false, c4d is self::B<core::double>);
-  self::throws(() → dynamic => f4b{dynamic}.call(0));
-  self::throws(() → dynamic => f4b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f4b{dynamic}(0));
+  self::throws(() → dynamic => f4b{dynamic}<core::String>());
   <X extends core::num, unrelated Y extends core::String>() → self::B<X> f5a = #C10;
   self::B<core::num> c5a = f5a<core::num, core::String>(){() → self::B<core::num>};
   self::expect(true, c5a is self::B<core::num>);
@@ -268,16 +268,16 @@ Try removing the extra positional arguments.
     f5a<core::num, core::num>(){() → self::B<core::num>};
   };
   dynamic f5b = #C10;
-  dynamic c5c = f5b{dynamic}.call();
+  dynamic c5c = f5b{dynamic}();
   self::expect(true, c5c is self::B<core::num>);
   self::expect(false, c5c is self::B<core::int>);
-  dynamic c5d = f5b{dynamic}.call<core::int, core::String>();
+  dynamic c5d = f5b{dynamic}<core::int, core::String>();
   self::expect(true, c5d is self::B<core::int>);
   self::expect(false, c5d is self::B<core::double>);
-  self::throws(() → dynamic => f5b{dynamic}.call(0));
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String, core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::num, core::num>());
+  self::throws(() → dynamic => f5b{dynamic}(0));
+  self::throws(() → dynamic => f5b{dynamic}<core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::String, core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::num, core::num>());
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.expect
index c0e0c322bc1..826d4263da1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.expect
@@ -130,9 +130,9 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(0);
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::A);
-  self::throws(() → dynamic => f1b{dynamic}.call(0));
+  self::throws(() → dynamic => f1b{dynamic}(0));
   <unrelated X extends core::num>() → self::A f2a = #C2;
   self::A c2a = f2a<core::num>(){() → self::A};
   self::expect(true, c2a is self::A);
@@ -144,12 +144,12 @@ Try removing the extra positional arguments.
     f2a<core::String>(){() → self::A};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::A);
-  dynamic c2c = f2b{dynamic}.call<core::int>();
+  dynamic c2c = f2b{dynamic}<core::int>();
   self::expect(true, c2c is self::A);
-  self::throws(() → dynamic => f2b{dynamic}.call(0));
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}(0));
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
   () → self::B<core::String> f3a = #C4;
   self::B<core::String> c3a = f3a(){() → self::B<core::String>};
   self::expect(true, c3a is self::B<core::String>);
@@ -166,13 +166,13 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.<core::String>();
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call();
+  dynamic c3b = f3b{dynamic}();
   self::expect(true, c3b is self::B<core::String>);
   self::expect(false, c3b is self::B<core::int>);
   self::expect(0, c3a.{self::B::field1}{core::int});
   self::expect("", c3a.{self::B::field2}{core::String});
-  self::throws(() → dynamic => f3b{dynamic}.call(0));
-  self::throws(() → dynamic => f3b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f3b{dynamic}(0));
+  self::throws(() → dynamic => f3b{dynamic}<core::String>());
   (core::int) → self::B<core::String> f3c = #C6;
   self::B<core::String> c3c = f3c(42){(core::int) → self::B<core::String>};
   self::expect(true, c3c is self::B<core::String>);
@@ -192,14 +192,14 @@ Try removing the extra positional arguments.
        ^" in f3c{<inapplicable>}.<core::String>(0);
   };
   dynamic f3d = #C6;
-  dynamic c3d = f3d{dynamic}.call(42);
+  dynamic c3d = f3d{dynamic}(42);
   self::expect(true, c3d is self::B<core::String>);
   self::expect(false, c3d is self::B<core::int>);
   self::expect(42, c3d{dynamic}.field1);
   self::expect("", c3d{dynamic}.field2);
-  self::throws(() → dynamic => f3d{dynamic}.call());
-  self::throws(() → dynamic => f3d{dynamic}.call(0, 0));
-  self::throws(() → dynamic => f3d{dynamic}.call<core::String>(0));
+  self::throws(() → dynamic => f3d{dynamic}());
+  self::throws(() → dynamic => f3d{dynamic}(0, 0));
+  self::throws(() → dynamic => f3d{dynamic}<core::String>(0));
   (core::int, core::String) → self::B<core::String> f3e = #C8;
   self::B<core::String> c3e = f3e(42, "foo"){(core::int, core::String) → self::B<core::String>};
   self::expect(true, c3e is self::B<core::String>);
@@ -218,14 +218,14 @@ Try removing the extra positional arguments.
        ^" in f3e{<inapplicable>}.<core::String>(0, "");
   };
   dynamic f3f = #C8;
-  dynamic c3f = f3f{dynamic}.call(42, "foo");
+  dynamic c3f = f3f{dynamic}(42, "foo");
   self::expect(true, c3f is self::B<core::String>);
   self::expect(false, c3f is self::B<core::int>);
   self::expect(42, c3f{dynamic}.field1);
   self::expect("foo", c3f{dynamic}.field2);
-  self::throws(() → dynamic => c3f{dynamic}.call());
-  self::throws(() → dynamic => c3f{dynamic}.call(0));
-  self::throws(() → dynamic => c3f{dynamic}.call<core::String>(0));
+  self::throws(() → dynamic => c3f{dynamic}());
+  self::throws(() → dynamic => c3f{dynamic}(0));
+  self::throws(() → dynamic => c3f{dynamic}<core::String>(0));
   <X extends core::num>() → self::B<X> f4a = #C9;
   self::B<core::num> c4a = f4a<core::num>(){() → self::B<core::num>};
   self::expect(true, c4a is self::B<core::num>);
@@ -241,14 +241,14 @@ Try removing the extra positional arguments.
     f4a<core::String>(){() → self::B<core::String>};
   };
   dynamic f4b = #C9;
-  dynamic c4c = f4b{dynamic}.call();
+  dynamic c4c = f4b{dynamic}();
   self::expect(true, c4c is self::B<core::num>);
   self::expect(false, c4c is self::B<core::int>);
-  dynamic c4d = f4b{dynamic}.call<core::int>();
+  dynamic c4d = f4b{dynamic}<core::int>();
   self::expect(true, c4d is self::B<core::int>);
   self::expect(false, c4d is self::B<core::double>);
-  self::throws(() → dynamic => f4b{dynamic}.call(0));
-  self::throws(() → dynamic => f4b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f4b{dynamic}(0));
+  self::throws(() → dynamic => f4b{dynamic}<core::String>());
   <X extends core::num, unrelated Y extends core::String>() → self::B<X> f5a = #C10;
   self::B<core::num> c5a = f5a<core::num, core::String>(){() → self::B<core::num>};
   self::expect(true, c5a is self::B<core::num>);
@@ -268,16 +268,16 @@ Try removing the extra positional arguments.
     f5a<core::num, core::num>(){() → self::B<core::num>};
   };
   dynamic f5b = #C10;
-  dynamic c5c = f5b{dynamic}.call();
+  dynamic c5c = f5b{dynamic}();
   self::expect(true, c5c is self::B<core::num>);
   self::expect(false, c5c is self::B<core::int>);
-  dynamic c5d = f5b{dynamic}.call<core::int, core::String>();
+  dynamic c5d = f5b{dynamic}<core::int, core::String>();
   self::expect(true, c5d is self::B<core::int>);
   self::expect(false, c5d is self::B<core::double>);
-  self::throws(() → dynamic => f5b{dynamic}.call(0));
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String, core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::num, core::num>());
+  self::throws(() → dynamic => f5b{dynamic}(0));
+  self::throws(() → dynamic => f5b{dynamic}<core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::String, core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::num, core::num>());
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.modular.expect
index c0e0c322bc1..826d4263da1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.modular.expect
@@ -130,9 +130,9 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(0);
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::A);
-  self::throws(() → dynamic => f1b{dynamic}.call(0));
+  self::throws(() → dynamic => f1b{dynamic}(0));
   <unrelated X extends core::num>() → self::A f2a = #C2;
   self::A c2a = f2a<core::num>(){() → self::A};
   self::expect(true, c2a is self::A);
@@ -144,12 +144,12 @@ Try removing the extra positional arguments.
     f2a<core::String>(){() → self::A};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::A);
-  dynamic c2c = f2b{dynamic}.call<core::int>();
+  dynamic c2c = f2b{dynamic}<core::int>();
   self::expect(true, c2c is self::A);
-  self::throws(() → dynamic => f2b{dynamic}.call(0));
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}(0));
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
   () → self::B<core::String> f3a = #C4;
   self::B<core::String> c3a = f3a(){() → self::B<core::String>};
   self::expect(true, c3a is self::B<core::String>);
@@ -166,13 +166,13 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.<core::String>();
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call();
+  dynamic c3b = f3b{dynamic}();
   self::expect(true, c3b is self::B<core::String>);
   self::expect(false, c3b is self::B<core::int>);
   self::expect(0, c3a.{self::B::field1}{core::int});
   self::expect("", c3a.{self::B::field2}{core::String});
-  self::throws(() → dynamic => f3b{dynamic}.call(0));
-  self::throws(() → dynamic => f3b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f3b{dynamic}(0));
+  self::throws(() → dynamic => f3b{dynamic}<core::String>());
   (core::int) → self::B<core::String> f3c = #C6;
   self::B<core::String> c3c = f3c(42){(core::int) → self::B<core::String>};
   self::expect(true, c3c is self::B<core::String>);
@@ -192,14 +192,14 @@ Try removing the extra positional arguments.
        ^" in f3c{<inapplicable>}.<core::String>(0);
   };
   dynamic f3d = #C6;
-  dynamic c3d = f3d{dynamic}.call(42);
+  dynamic c3d = f3d{dynamic}(42);
   self::expect(true, c3d is self::B<core::String>);
   self::expect(false, c3d is self::B<core::int>);
   self::expect(42, c3d{dynamic}.field1);
   self::expect("", c3d{dynamic}.field2);
-  self::throws(() → dynamic => f3d{dynamic}.call());
-  self::throws(() → dynamic => f3d{dynamic}.call(0, 0));
-  self::throws(() → dynamic => f3d{dynamic}.call<core::String>(0));
+  self::throws(() → dynamic => f3d{dynamic}());
+  self::throws(() → dynamic => f3d{dynamic}(0, 0));
+  self::throws(() → dynamic => f3d{dynamic}<core::String>(0));
   (core::int, core::String) → self::B<core::String> f3e = #C8;
   self::B<core::String> c3e = f3e(42, "foo"){(core::int, core::String) → self::B<core::String>};
   self::expect(true, c3e is self::B<core::String>);
@@ -218,14 +218,14 @@ Try removing the extra positional arguments.
        ^" in f3e{<inapplicable>}.<core::String>(0, "");
   };
   dynamic f3f = #C8;
-  dynamic c3f = f3f{dynamic}.call(42, "foo");
+  dynamic c3f = f3f{dynamic}(42, "foo");
   self::expect(true, c3f is self::B<core::String>);
   self::expect(false, c3f is self::B<core::int>);
   self::expect(42, c3f{dynamic}.field1);
   self::expect("foo", c3f{dynamic}.field2);
-  self::throws(() → dynamic => c3f{dynamic}.call());
-  self::throws(() → dynamic => c3f{dynamic}.call(0));
-  self::throws(() → dynamic => c3f{dynamic}.call<core::String>(0));
+  self::throws(() → dynamic => c3f{dynamic}());
+  self::throws(() → dynamic => c3f{dynamic}(0));
+  self::throws(() → dynamic => c3f{dynamic}<core::String>(0));
   <X extends core::num>() → self::B<X> f4a = #C9;
   self::B<core::num> c4a = f4a<core::num>(){() → self::B<core::num>};
   self::expect(true, c4a is self::B<core::num>);
@@ -241,14 +241,14 @@ Try removing the extra positional arguments.
     f4a<core::String>(){() → self::B<core::String>};
   };
   dynamic f4b = #C9;
-  dynamic c4c = f4b{dynamic}.call();
+  dynamic c4c = f4b{dynamic}();
   self::expect(true, c4c is self::B<core::num>);
   self::expect(false, c4c is self::B<core::int>);
-  dynamic c4d = f4b{dynamic}.call<core::int>();
+  dynamic c4d = f4b{dynamic}<core::int>();
   self::expect(true, c4d is self::B<core::int>);
   self::expect(false, c4d is self::B<core::double>);
-  self::throws(() → dynamic => f4b{dynamic}.call(0));
-  self::throws(() → dynamic => f4b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f4b{dynamic}(0));
+  self::throws(() → dynamic => f4b{dynamic}<core::String>());
   <X extends core::num, unrelated Y extends core::String>() → self::B<X> f5a = #C10;
   self::B<core::num> c5a = f5a<core::num, core::String>(){() → self::B<core::num>};
   self::expect(true, c5a is self::B<core::num>);
@@ -268,16 +268,16 @@ Try removing the extra positional arguments.
     f5a<core::num, core::num>(){() → self::B<core::num>};
   };
   dynamic f5b = #C10;
-  dynamic c5c = f5b{dynamic}.call();
+  dynamic c5c = f5b{dynamic}();
   self::expect(true, c5c is self::B<core::num>);
   self::expect(false, c5c is self::B<core::int>);
-  dynamic c5d = f5b{dynamic}.call<core::int, core::String>();
+  dynamic c5d = f5b{dynamic}<core::int, core::String>();
   self::expect(true, c5d is self::B<core::int>);
   self::expect(false, c5d is self::B<core::double>);
-  self::throws(() → dynamic => f5b{dynamic}.call(0));
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String, core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::num, core::num>());
+  self::throws(() → dynamic => f5b{dynamic}(0));
+  self::throws(() → dynamic => f5b{dynamic}<core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::String, core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::num, core::num>());
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.transformed.expect
index 64dbb4b3904..bd7670bcde1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_tear_off.dart.weak.transformed.expect
@@ -130,9 +130,9 @@ Try removing the extra positional arguments.
        ^" in f1a{<inapplicable>}.(0);
   };
   dynamic f1b = #C1;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::A);
-  self::throws(() → dynamic => f1b{dynamic}.call(0));
+  self::throws(() → dynamic => f1b{dynamic}(0));
   <unrelated X extends core::num>() → self::A f2a = #C2;
   self::A c2a = f2a<core::num>(){() → self::A};
   self::expect(true, c2a is self::A);
@@ -144,12 +144,12 @@ Try removing the extra positional arguments.
     f2a<core::String>(){() → self::A};
   };
   dynamic f2b = #C2;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::A);
-  dynamic c2c = f2b{dynamic}.call<core::int>();
+  dynamic c2c = f2b{dynamic}<core::int>();
   self::expect(true, c2c is self::A);
-  self::throws(() → dynamic => f2b{dynamic}.call(0));
-  self::throws(() → dynamic => f2b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f2b{dynamic}(0));
+  self::throws(() → dynamic => f2b{dynamic}<core::String>());
   () → self::B<core::String> f3a = #C4;
   self::B<core::String> c3a = f3a(){() → self::B<core::String>};
   self::expect(true, c3a is self::B<core::String>);
@@ -166,13 +166,13 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.<core::String>();
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call();
+  dynamic c3b = f3b{dynamic}();
   self::expect(true, c3b is self::B<core::String>);
   self::expect(false, c3b is self::B<core::int>);
   self::expect(0, c3a.{self::B::field1}{core::int});
   self::expect("", c3a.{self::B::field2}{core::String});
-  self::throws(() → dynamic => f3b{dynamic}.call(0));
-  self::throws(() → dynamic => f3b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f3b{dynamic}(0));
+  self::throws(() → dynamic => f3b{dynamic}<core::String>());
   (core::int) → self::B<core::String> f3c = #C6;
   self::B<core::String> c3c = f3c(42){(core::int) → self::B<core::String>};
   self::expect(true, c3c is self::B<core::String>);
@@ -192,14 +192,14 @@ Try removing the extra positional arguments.
        ^" in f3c{<inapplicable>}.<core::String>(0);
   };
   dynamic f3d = #C6;
-  dynamic c3d = f3d{dynamic}.call(42);
+  dynamic c3d = f3d{dynamic}(42);
   self::expect(true, c3d is self::B<core::String>);
   self::expect(false, c3d is self::B<core::int>);
   self::expect(42, c3d{dynamic}.field1);
   self::expect("", c3d{dynamic}.field2);
-  self::throws(() → dynamic => f3d{dynamic}.call());
-  self::throws(() → dynamic => f3d{dynamic}.call(0, 0));
-  self::throws(() → dynamic => f3d{dynamic}.call<core::String>(0));
+  self::throws(() → dynamic => f3d{dynamic}());
+  self::throws(() → dynamic => f3d{dynamic}(0, 0));
+  self::throws(() → dynamic => f3d{dynamic}<core::String>(0));
   (core::int, core::String) → self::B<core::String> f3e = #C8;
   self::B<core::String> c3e = f3e(42, "foo"){(core::int, core::String) → self::B<core::String>};
   self::expect(true, c3e is self::B<core::String>);
@@ -218,14 +218,14 @@ Try removing the extra positional arguments.
        ^" in f3e{<inapplicable>}.<core::String>(0, "");
   };
   dynamic f3f = #C8;
-  dynamic c3f = f3f{dynamic}.call(42, "foo");
+  dynamic c3f = f3f{dynamic}(42, "foo");
   self::expect(true, c3f is self::B<core::String>);
   self::expect(false, c3f is self::B<core::int>);
   self::expect(42, c3f{dynamic}.field1);
   self::expect("foo", c3f{dynamic}.field2);
-  self::throws(() → dynamic => c3f{dynamic}.call());
-  self::throws(() → dynamic => c3f{dynamic}.call(0));
-  self::throws(() → dynamic => c3f{dynamic}.call<core::String>(0));
+  self::throws(() → dynamic => c3f{dynamic}());
+  self::throws(() → dynamic => c3f{dynamic}(0));
+  self::throws(() → dynamic => c3f{dynamic}<core::String>(0));
   <X extends core::num>() → self::B<X> f4a = #C9;
   self::B<core::num> c4a = f4a<core::num>(){() → self::B<core::num>};
   self::expect(true, c4a is self::B<core::num>);
@@ -241,14 +241,14 @@ Try removing the extra positional arguments.
     f4a<core::String>(){() → self::B<core::String>};
   };
   dynamic f4b = #C9;
-  dynamic c4c = f4b{dynamic}.call();
+  dynamic c4c = f4b{dynamic}();
   self::expect(true, c4c is self::B<core::num>);
   self::expect(false, c4c is self::B<core::int>);
-  dynamic c4d = f4b{dynamic}.call<core::int>();
+  dynamic c4d = f4b{dynamic}<core::int>();
   self::expect(true, c4d is self::B<core::int>);
   self::expect(false, c4d is self::B<core::double>);
-  self::throws(() → dynamic => f4b{dynamic}.call(0));
-  self::throws(() → dynamic => f4b{dynamic}.call<core::String>());
+  self::throws(() → dynamic => f4b{dynamic}(0));
+  self::throws(() → dynamic => f4b{dynamic}<core::String>());
   <X extends core::num, unrelated Y extends core::String>() → self::B<X> f5a = #C10;
   self::B<core::num> c5a = f5a<core::num, core::String>(){() → self::B<core::num>};
   self::expect(true, c5a is self::B<core::num>);
@@ -268,16 +268,16 @@ Try removing the extra positional arguments.
     f5a<core::num, core::num>(){() → self::B<core::num>};
   };
   dynamic f5b = #C10;
-  dynamic c5c = f5b{dynamic}.call();
+  dynamic c5c = f5b{dynamic}();
   self::expect(true, c5c is self::B<core::num>);
   self::expect(false, c5c is self::B<core::int>);
-  dynamic c5d = f5b{dynamic}.call<core::int, core::String>();
+  dynamic c5d = f5b{dynamic}<core::int, core::String>();
   self::expect(true, c5d is self::B<core::int>);
   self::expect(false, c5d is self::B<core::double>);
-  self::throws(() → dynamic => f5b{dynamic}.call(0));
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::String, core::String>());
-  self::throws(() → dynamic => f5b{dynamic}.call<core::num, core::num>());
+  self::throws(() → dynamic => f5b{dynamic}(0));
+  self::throws(() → dynamic => f5b{dynamic}<core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::String, core::String>());
+  self::throws(() → dynamic => f5b{dynamic}<core::num, core::num>());
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual))
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.expect
index ec57ed0d24a..7dc9e980562 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.expect
@@ -125,14 +125,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -150,10 +150,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -166,7 +166,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -184,8 +184,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -215,10 +215,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
   () → self::Class7b f7a = #C8;
   self::Class7b c7a = f7a(){() → self::Class7b};
   self::expect(true, c7a is self::Class7a);
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.transformed.expect
index 17478b06577..16f1994a191 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.transformed.expect
@@ -125,14 +125,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -150,10 +150,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -166,7 +166,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -184,8 +184,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -215,10 +215,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
   () → self::Class7b f7a = #C8;
   self::Class7b c7a = f7a(){() → self::Class7b};
   self::expect(true, c7a is self::Class7a);
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.expect
index ec57ed0d24a..7dc9e980562 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.expect
@@ -125,14 +125,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -150,10 +150,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -166,7 +166,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -184,8 +184,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -215,10 +215,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
   () → self::Class7b f7a = #C8;
   self::Class7b c7a = f7a(){() → self::Class7b};
   self::expect(true, c7a is self::Class7a);
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.modular.expect
index ec57ed0d24a..7dc9e980562 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.modular.expect
@@ -125,14 +125,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -150,10 +150,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -166,7 +166,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -184,8 +184,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -215,10 +215,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
   () → self::Class7b f7a = #C8;
   self::Class7b c7a = f7a(){() → self::Class7b};
   self::expect(true, c7a is self::Class7a);
diff --git a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.transformed.expect
index 17478b06577..16f1994a191 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.transformed.expect
@@ -125,14 +125,14 @@ static method testNoArgs() → dynamic {
   self::Class1 c1a = f1a(){() → self::Class1};
   self::expect(true, c1a is self::Class1);
   dynamic f1b = #C2;
-  dynamic c1b = f1b{dynamic}.call();
+  dynamic c1b = f1b{dynamic}();
   self::expect(true, c1b is self::Class1);
   self::expect(true, core::identical(f1a, f1b));
   () → self::Class2 f2a = #C3;
   self::Class2 c2a = f2a(){() → self::Class2};
   self::expect(true, c2a is self::Class2);
   dynamic f2b = #C3;
-  dynamic c2b = f2b{dynamic}.call();
+  dynamic c2b = f2b{dynamic}();
   self::expect(true, c2b is self::Class2);
   self::expect(true, core::identical(f2a, f2b));
 }
@@ -150,10 +150,10 @@ Try removing the extra positional arguments.
        ^" in f3a{<inapplicable>}.(42, 87);
   };
   dynamic f3b = #C4;
-  dynamic c3b = f3b{dynamic}.call(87);
+  dynamic c3b = f3b{dynamic}(87);
   self::expect(87, c3b{dynamic}.field);
-  self::throws(() → dynamic => f3b{dynamic}.call());
-  self::throws(() → dynamic => f3b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f3b{dynamic}());
+  self::throws(() → dynamic => f3b{dynamic}(42, 87));
   ([core::int?]) → self::Class4 f4a = #C5;
   self::Class4 c4a = f4a(){([core::int?]) → self::Class4};
   self::expect(null, c4a.{self::Class4::field}{core::int?});
@@ -166,7 +166,7 @@ Try removing the extra positional arguments.
        ^" in f4a{<inapplicable>}.(42, 87);
   };
   dynamic f4b = #C5;
-  self::throws(() → dynamic => f4b{dynamic}.call(42, 87));
+  self::throws(() → dynamic => f4b{dynamic}(42, 87));
   (core::int, [core::int?]) → self::Class5 f5a = #C6;
   self::Class5 c5a = f5a(42){(core::int, [core::int?]) → self::Class5};
   self::expect(42, c5a.{self::Class5::field1}{core::int});
@@ -184,8 +184,8 @@ Try removing the extra positional arguments.
        ^" in f5a{<inapplicable>}.(42, 87, 123);
   };
   dynamic f5b = #C6;
-  self::throws(() → dynamic => f5b{dynamic}.call());
-  self::throws(() → dynamic => f5b{dynamic}.call(42, 87, 123));
+  self::throws(() → dynamic => f5b{dynamic}());
+  self::throws(() → dynamic => f5b{dynamic}(42, 87, 123));
   (core::int, {field2: core::int?, required field3: core::int}) → self::Class6 f6a = #C7;
   self::Class6 c6a = f6a(42, field3: 87){(core::int, {field2: core::int?, required field3: core::int}) → self::Class6};
   self::expect(42, c6a.{self::Class6::field1}{core::int});
@@ -215,10 +215,10 @@ Try removing the extra positional arguments.
   self::expect(123, c6c.{self::Class6::field2}{core::int?});
   self::expect(42, c6c.{self::Class6::field3}{core::int});
   dynamic f6b = #C7;
-  self::throws(() → dynamic => f6b{dynamic}.call());
-  self::throws(() → dynamic => f6b{dynamic}.call(42), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(42, 87), inSoundModeOnly: true);
-  self::throws(() → dynamic => f6b{dynamic}.call(field1: 87, field2: 87));
+  self::throws(() → dynamic => f6b{dynamic}());
+  self::throws(() → dynamic => f6b{dynamic}(42), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(42, 87), inSoundModeOnly: true);
+  self::throws(() → dynamic => f6b{dynamic}(field1: 87, field2: 87));
   () → self::Class7b f7a = #C8;
   self::Class7b c7a = f7a(){() → self::Class7b};
   self::expect(true, c7a is self::Class7a);
diff --git a/pkg/front_end/testcases/expression/type_closure_evaluation_2.expression.yaml.expect b/pkg/front_end/testcases/expression/type_closure_evaluation_2.expression.yaml.expect
index 9b852fc5c8e..3c7bdb99405 100644
--- a/pkg/front_end/testcases/expression/type_closure_evaluation_2.expression.yaml.expect
+++ b/pkg/front_end/testcases/expression/type_closure_evaluation_2.expression.yaml.expect
@@ -1,4 +1,4 @@
 Errors: {
 }
 method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr(dynamic x) → dynamic
-  return x{dynamic}.call(){dynamic}.fold<dart.core::int>(0, (dynamic previousValue, dynamic element) → dynamic => previousValue{dynamic}.+(element{dynamic}.length));
+  return x{dynamic}(){dynamic}.fold<dart.core::int>(0, (dynamic previousValue, dynamic element) → dynamic => previousValue{dynamic}.+(element{dynamic}.length));
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 3bd75a71cf7..e182e96b608 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
@@ -343,11 +343,11 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^" 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'.
 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;
+             ^^" in #this.{<unresolved>}it = 42;
 }
 static extension-type-member method InlineClass|get#test(lowered final self::InlineClass /* = core::int */ #this) → () → void
   return () → void => self::InlineClass|test(#this);
@@ -371,11 +371,11 @@ Try changing the operand or remove the type arguments.
   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>'.
 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;
+                  ^^" 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>'.
 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;
+             ^^" in #this.{<unresolved>}it = t;
 }
 static extension-type-member method GenericInlineClass|get#test<T extends core::Object? = dynamic>(lowered final self::GenericInlineClass<self::GenericInlineClass|get#test::T%>% /* = self::GenericInlineClass|get#test::T% */ #this) → (self::GenericInlineClass|get#test::T%) → void
   return (self::GenericInlineClass|get#test::T% t) → void => self::GenericInlineClass|test<self::GenericInlineClass|get#test::T%>(#this, t);
@@ -399,11 +399,11 @@ Try changing the operand or remove the type arguments.
   () → 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>'.
 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;
+                  ^^" 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>'.
 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;
+             ^^" in #this.{<unresolved>}it = t;
   self::FunctionInlineClass|test::T% d1 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
   self::FunctionInlineClass|test::T% d2 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
   self::FunctionInlineClass|test::T% d3 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
@@ -427,14 +427,14 @@ static extension-type-member method GenericFunctionInlineClass|test(lowered fina
   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'.
 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 class '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'.
 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 class '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;
@@ -467,13 +467,13 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^" 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'.
 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;
-  dynamic d1 = (#this as{Unchecked} dynamic){dynamic}.call();
-  dynamic d2 = (#this as{Unchecked} dynamic){dynamic}.call();
+             ^^" in #this.{<unresolved>}it = 42;
+  dynamic d1 = (#this as{Unchecked} dynamic){dynamic}();
+  dynamic d2 = (#this as{Unchecked} dynamic){dynamic}();
   dynamic d3 = (#this as{Unchecked} dynamic){dynamic}.call();
   dynamic d4 = (#this as{Unchecked} dynamic){dynamic}.call();
 }
@@ -509,19 +509,19 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^" 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'.
 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;
+             ^" 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'.
 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";
+                  ^" 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'.
 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";
+             ^" 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'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d1 = this.a(); // Error
@@ -566,7 +566,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                       ^^" in inlineClass.{<unresolved>}it = 42;
   core::String b1 = genericInlineClass as{Unchecked} core::String;
   invalid-type b2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:123:33: Error: The static type of the explicit instantiation operand must be a generic function type but is 'String'.
 Try changing the operand or remove the type arguments.
@@ -575,7 +575,7 @@ Try changing the operand or remove the type arguments.
   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>'.
 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";
+                              ^^" in genericInlineClass.{<unresolved>}it = "42";
   () → core::String c1 = functionInlineClass as{Unchecked} () → core::String;
   invalid-type c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:128:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'String Function()'.
 Try changing the operand or remove the type arguments.
@@ -586,7 +586,7 @@ Try changing the operand or remove the type arguments.
   () → 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>'.
 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";
+                               ^^" in functionInlineClass.{<unresolved>}it = () → core::String => "42";
   <T extends core::Object? = dynamic>() → T% d1 = genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%;
   () → core::int d2 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int d3 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
@@ -595,17 +595,17 @@ Try correcting the name to the name of an existing setter, or defining a setter
   <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'.
 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 "";
+                                      ^^" in genericFunctionInlineClass.{<unresolved>}it = <T extends core::Object? = dynamic>() → Never => throw "";
   dynamic e1 = dynamicInlineClass as{Unchecked} dynamic;
   invalid-type e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:143:33: Error: The static type of the explicit instantiation operand must be a generic function type but is 'dynamic'.
 Try changing the operand or remove the type arguments.
   var e2 = dynamicInlineClass.it<int>; // Error
                                 ^";
-  dynamic e3 = (dynamicInlineClass as{Unchecked} dynamic){dynamic}.call();
+  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'.
 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";
+                              ^^" in dynamicInlineClass.{<unresolved>}it = "42";
   core::int f1 = erroneousInlineClass as{Unchecked} core::int;
   invalid-type f2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:149:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'int'.
 Try changing the operand or remove the type arguments.
@@ -614,7 +614,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                                ^" in erroneousInlineClass.{<unresolved>}a = 42;
   core::String g1 = erroneousInlineClass as{Unchecked} core::String;
   invalid-type g2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:153:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'int'.
 Try changing the operand or remove the type arguments.
@@ -623,7 +623,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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";
+                                ^" 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'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h1 = privateInlineClass._it; // Error
@@ -635,7 +635,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                              ^^^" in privateInlineClass.{<unresolved>}_it = 42;
 }
 
 library;
@@ -692,11 +692,11 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^^" 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'.
 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;
+             ^^^" in #this.{<unresolved>}_it = 42;
 }
 static extension-type-member method PrivateInlineClass|get#test(lowered final self2::PrivateInlineClass /* = core::int */ #this) → () → void
   return () → void => self2::PrivateInlineClass|test(#this);
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 3bd75a71cf7..e182e96b608 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
@@ -343,11 +343,11 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^" 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'.
 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;
+             ^^" in #this.{<unresolved>}it = 42;
 }
 static extension-type-member method InlineClass|get#test(lowered final self::InlineClass /* = core::int */ #this) → () → void
   return () → void => self::InlineClass|test(#this);
@@ -371,11 +371,11 @@ Try changing the operand or remove the type arguments.
   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>'.
 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;
+                  ^^" 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>'.
 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;
+             ^^" in #this.{<unresolved>}it = t;
 }
 static extension-type-member method GenericInlineClass|get#test<T extends core::Object? = dynamic>(lowered final self::GenericInlineClass<self::GenericInlineClass|get#test::T%>% /* = self::GenericInlineClass|get#test::T% */ #this) → (self::GenericInlineClass|get#test::T%) → void
   return (self::GenericInlineClass|get#test::T% t) → void => self::GenericInlineClass|test<self::GenericInlineClass|get#test::T%>(#this, t);
@@ -399,11 +399,11 @@ Try changing the operand or remove the type arguments.
   () → 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>'.
 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;
+                  ^^" 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>'.
 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;
+             ^^" in #this.{<unresolved>}it = t;
   self::FunctionInlineClass|test::T% d1 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
   self::FunctionInlineClass|test::T% d2 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
   self::FunctionInlineClass|test::T% d3 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
@@ -427,14 +427,14 @@ static extension-type-member method GenericFunctionInlineClass|test(lowered fina
   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'.
 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 class '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'.
 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 class '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;
@@ -467,13 +467,13 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^" 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'.
 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;
-  dynamic d1 = (#this as{Unchecked} dynamic){dynamic}.call();
-  dynamic d2 = (#this as{Unchecked} dynamic){dynamic}.call();
+             ^^" in #this.{<unresolved>}it = 42;
+  dynamic d1 = (#this as{Unchecked} dynamic){dynamic}();
+  dynamic d2 = (#this as{Unchecked} dynamic){dynamic}();
   dynamic d3 = (#this as{Unchecked} dynamic){dynamic}.call();
   dynamic d4 = (#this as{Unchecked} dynamic){dynamic}.call();
 }
@@ -509,19 +509,19 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^" 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'.
 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;
+             ^" 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'.
 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";
+                  ^" 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'.
 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";
+             ^" 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'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d1 = this.a(); // Error
@@ -566,7 +566,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                       ^^" in inlineClass.{<unresolved>}it = 42;
   core::String b1 = genericInlineClass as{Unchecked} core::String;
   invalid-type b2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:123:33: Error: The static type of the explicit instantiation operand must be a generic function type but is 'String'.
 Try changing the operand or remove the type arguments.
@@ -575,7 +575,7 @@ Try changing the operand or remove the type arguments.
   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>'.
 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";
+                              ^^" in genericInlineClass.{<unresolved>}it = "42";
   () → core::String c1 = functionInlineClass as{Unchecked} () → core::String;
   invalid-type c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:128:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'String Function()'.
 Try changing the operand or remove the type arguments.
@@ -586,7 +586,7 @@ Try changing the operand or remove the type arguments.
   () → 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>'.
 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";
+                               ^^" in functionInlineClass.{<unresolved>}it = () → core::String => "42";
   <T extends core::Object? = dynamic>() → T% d1 = genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%;
   () → core::int d2 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int d3 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
@@ -595,17 +595,17 @@ Try correcting the name to the name of an existing setter, or defining a setter
   <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'.
 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 "";
+                                      ^^" in genericFunctionInlineClass.{<unresolved>}it = <T extends core::Object? = dynamic>() → Never => throw "";
   dynamic e1 = dynamicInlineClass as{Unchecked} dynamic;
   invalid-type e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:143:33: Error: The static type of the explicit instantiation operand must be a generic function type but is 'dynamic'.
 Try changing the operand or remove the type arguments.
   var e2 = dynamicInlineClass.it<int>; // Error
                                 ^";
-  dynamic e3 = (dynamicInlineClass as{Unchecked} dynamic){dynamic}.call();
+  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'.
 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";
+                              ^^" in dynamicInlineClass.{<unresolved>}it = "42";
   core::int f1 = erroneousInlineClass as{Unchecked} core::int;
   invalid-type f2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:149:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'int'.
 Try changing the operand or remove the type arguments.
@@ -614,7 +614,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                                ^" in erroneousInlineClass.{<unresolved>}a = 42;
   core::String g1 = erroneousInlineClass as{Unchecked} core::String;
   invalid-type g2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:153:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'int'.
 Try changing the operand or remove the type arguments.
@@ -623,7 +623,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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";
+                                ^" 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'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h1 = privateInlineClass._it; // Error
@@ -635,7 +635,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                              ^^^" in privateInlineClass.{<unresolved>}_it = 42;
 }
 
 library;
@@ -692,11 +692,11 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^^" 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'.
 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;
+             ^^^" in #this.{<unresolved>}_it = 42;
 }
 static extension-type-member method PrivateInlineClass|get#test(lowered final self2::PrivateInlineClass /* = core::int */ #this) → () → void
   return () → void => self2::PrivateInlineClass|test(#this);
diff --git a/pkg/front_end/testcases/extension_types/field_access.dart.weak.expect b/pkg/front_end/testcases/extension_types/field_access.dart.weak.expect
index 3bd75a71cf7..e182e96b608 100644
--- a/pkg/front_end/testcases/extension_types/field_access.dart.weak.expect
+++ b/pkg/front_end/testcases/extension_types/field_access.dart.weak.expect
@@ -343,11 +343,11 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^" 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'.
 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;
+             ^^" in #this.{<unresolved>}it = 42;
 }
 static extension-type-member method InlineClass|get#test(lowered final self::InlineClass /* = core::int */ #this) → () → void
   return () → void => self::InlineClass|test(#this);
@@ -371,11 +371,11 @@ Try changing the operand or remove the type arguments.
   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>'.
 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;
+                  ^^" 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>'.
 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;
+             ^^" in #this.{<unresolved>}it = t;
 }
 static extension-type-member method GenericInlineClass|get#test<T extends core::Object? = dynamic>(lowered final self::GenericInlineClass<self::GenericInlineClass|get#test::T%>% /* = self::GenericInlineClass|get#test::T% */ #this) → (self::GenericInlineClass|get#test::T%) → void
   return (self::GenericInlineClass|get#test::T% t) → void => self::GenericInlineClass|test<self::GenericInlineClass|get#test::T%>(#this, t);
@@ -399,11 +399,11 @@ Try changing the operand or remove the type arguments.
   () → 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>'.
 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;
+                  ^^" 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>'.
 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;
+             ^^" in #this.{<unresolved>}it = t;
   self::FunctionInlineClass|test::T% d1 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
   self::FunctionInlineClass|test::T% d2 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
   self::FunctionInlineClass|test::T% d3 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
@@ -427,14 +427,14 @@ static extension-type-member method GenericFunctionInlineClass|test(lowered fina
   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'.
 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 class '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'.
 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 class '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;
@@ -467,13 +467,13 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^" 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'.
 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;
-  dynamic d1 = (#this as{Unchecked} dynamic){dynamic}.call();
-  dynamic d2 = (#this as{Unchecked} dynamic){dynamic}.call();
+             ^^" in #this.{<unresolved>}it = 42;
+  dynamic d1 = (#this as{Unchecked} dynamic){dynamic}();
+  dynamic d2 = (#this as{Unchecked} dynamic){dynamic}();
   dynamic d3 = (#this as{Unchecked} dynamic){dynamic}.call();
   dynamic d4 = (#this as{Unchecked} dynamic){dynamic}.call();
 }
@@ -509,19 +509,19 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^" 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'.
 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;
+             ^" 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'.
 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";
+                  ^" 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'.
 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";
+             ^" 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'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d1 = this.a(); // Error
@@ -566,7 +566,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                       ^^" in inlineClass.{<unresolved>}it = 42;
   core::String b1 = genericInlineClass as{Unchecked} core::String;
   invalid-type b2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:123:33: Error: The static type of the explicit instantiation operand must be a generic function type but is 'String'.
 Try changing the operand or remove the type arguments.
@@ -575,7 +575,7 @@ Try changing the operand or remove the type arguments.
   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>'.
 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";
+                              ^^" in genericInlineClass.{<unresolved>}it = "42";
   () → core::String c1 = functionInlineClass as{Unchecked} () → core::String;
   invalid-type c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:128:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'String Function()'.
 Try changing the operand or remove the type arguments.
@@ -586,7 +586,7 @@ Try changing the operand or remove the type arguments.
   () → 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>'.
 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";
+                               ^^" in functionInlineClass.{<unresolved>}it = () → core::String => "42";
   <T extends core::Object? = dynamic>() → T% d1 = genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%;
   () → core::int d2 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int d3 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
@@ -595,17 +595,17 @@ Try correcting the name to the name of an existing setter, or defining a setter
   <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'.
 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 "";
+                                      ^^" in genericFunctionInlineClass.{<unresolved>}it = <T extends core::Object? = dynamic>() → Never => throw "";
   dynamic e1 = dynamicInlineClass as{Unchecked} dynamic;
   invalid-type e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:143:33: Error: The static type of the explicit instantiation operand must be a generic function type but is 'dynamic'.
 Try changing the operand or remove the type arguments.
   var e2 = dynamicInlineClass.it<int>; // Error
                                 ^";
-  dynamic e3 = (dynamicInlineClass as{Unchecked} dynamic){dynamic}.call();
+  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'.
 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";
+                              ^^" in dynamicInlineClass.{<unresolved>}it = "42";
   core::int f1 = erroneousInlineClass as{Unchecked} core::int;
   invalid-type f2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:149:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'int'.
 Try changing the operand or remove the type arguments.
@@ -614,7 +614,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                                ^" in erroneousInlineClass.{<unresolved>}a = 42;
   core::String g1 = erroneousInlineClass as{Unchecked} core::String;
   invalid-type g2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:153:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'int'.
 Try changing the operand or remove the type arguments.
@@ -623,7 +623,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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";
+                                ^" 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'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h1 = privateInlineClass._it; // Error
@@ -635,7 +635,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                              ^^^" in privateInlineClass.{<unresolved>}_it = 42;
 }
 
 library;
@@ -692,11 +692,11 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^^" 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'.
 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;
+             ^^^" in #this.{<unresolved>}_it = 42;
 }
 static extension-type-member method PrivateInlineClass|get#test(lowered final self2::PrivateInlineClass /* = core::int */ #this) → () → void
   return () → void => self2::PrivateInlineClass|test(#this);
diff --git a/pkg/front_end/testcases/extension_types/field_access.dart.weak.modular.expect b/pkg/front_end/testcases/extension_types/field_access.dart.weak.modular.expect
index 3bd75a71cf7..e182e96b608 100644
--- a/pkg/front_end/testcases/extension_types/field_access.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extension_types/field_access.dart.weak.modular.expect
@@ -343,11 +343,11 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^" 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'.
 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;
+             ^^" in #this.{<unresolved>}it = 42;
 }
 static extension-type-member method InlineClass|get#test(lowered final self::InlineClass /* = core::int */ #this) → () → void
   return () → void => self::InlineClass|test(#this);
@@ -371,11 +371,11 @@ Try changing the operand or remove the type arguments.
   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>'.
 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;
+                  ^^" 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>'.
 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;
+             ^^" in #this.{<unresolved>}it = t;
 }
 static extension-type-member method GenericInlineClass|get#test<T extends core::Object? = dynamic>(lowered final self::GenericInlineClass<self::GenericInlineClass|get#test::T%>% /* = self::GenericInlineClass|get#test::T% */ #this) → (self::GenericInlineClass|get#test::T%) → void
   return (self::GenericInlineClass|get#test::T% t) → void => self::GenericInlineClass|test<self::GenericInlineClass|get#test::T%>(#this, t);
@@ -399,11 +399,11 @@ Try changing the operand or remove the type arguments.
   () → 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>'.
 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;
+                  ^^" 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>'.
 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;
+             ^^" in #this.{<unresolved>}it = t;
   self::FunctionInlineClass|test::T% d1 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
   self::FunctionInlineClass|test::T% d2 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
   self::FunctionInlineClass|test::T% d3 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
@@ -427,14 +427,14 @@ static extension-type-member method GenericFunctionInlineClass|test(lowered fina
   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'.
 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 class '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'.
 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 class '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;
@@ -467,13 +467,13 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^" 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'.
 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;
-  dynamic d1 = (#this as{Unchecked} dynamic){dynamic}.call();
-  dynamic d2 = (#this as{Unchecked} dynamic){dynamic}.call();
+             ^^" in #this.{<unresolved>}it = 42;
+  dynamic d1 = (#this as{Unchecked} dynamic){dynamic}();
+  dynamic d2 = (#this as{Unchecked} dynamic){dynamic}();
   dynamic d3 = (#this as{Unchecked} dynamic){dynamic}.call();
   dynamic d4 = (#this as{Unchecked} dynamic){dynamic}.call();
 }
@@ -509,19 +509,19 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^" 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'.
 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;
+             ^" 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'.
 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";
+                  ^" 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'.
 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";
+             ^" 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'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d1 = this.a(); // Error
@@ -566,7 +566,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                       ^^" in inlineClass.{<unresolved>}it = 42;
   core::String b1 = genericInlineClass as{Unchecked} core::String;
   invalid-type b2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:123:33: Error: The static type of the explicit instantiation operand must be a generic function type but is 'String'.
 Try changing the operand or remove the type arguments.
@@ -575,7 +575,7 @@ Try changing the operand or remove the type arguments.
   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>'.
 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";
+                              ^^" in genericInlineClass.{<unresolved>}it = "42";
   () → core::String c1 = functionInlineClass as{Unchecked} () → core::String;
   invalid-type c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:128:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'String Function()'.
 Try changing the operand or remove the type arguments.
@@ -586,7 +586,7 @@ Try changing the operand or remove the type arguments.
   () → 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>'.
 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";
+                               ^^" in functionInlineClass.{<unresolved>}it = () → core::String => "42";
   <T extends core::Object? = dynamic>() → T% d1 = genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%;
   () → core::int d2 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int d3 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
@@ -595,17 +595,17 @@ Try correcting the name to the name of an existing setter, or defining a setter
   <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'.
 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 "";
+                                      ^^" in genericFunctionInlineClass.{<unresolved>}it = <T extends core::Object? = dynamic>() → Never => throw "";
   dynamic e1 = dynamicInlineClass as{Unchecked} dynamic;
   invalid-type e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:143:33: Error: The static type of the explicit instantiation operand must be a generic function type but is 'dynamic'.
 Try changing the operand or remove the type arguments.
   var e2 = dynamicInlineClass.it<int>; // Error
                                 ^";
-  dynamic e3 = (dynamicInlineClass as{Unchecked} dynamic){dynamic}.call();
+  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'.
 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";
+                              ^^" in dynamicInlineClass.{<unresolved>}it = "42";
   core::int f1 = erroneousInlineClass as{Unchecked} core::int;
   invalid-type f2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:149:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'int'.
 Try changing the operand or remove the type arguments.
@@ -614,7 +614,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                                ^" in erroneousInlineClass.{<unresolved>}a = 42;
   core::String g1 = erroneousInlineClass as{Unchecked} core::String;
   invalid-type g2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:153:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'int'.
 Try changing the operand or remove the type arguments.
@@ -623,7 +623,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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";
+                                ^" 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'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h1 = privateInlineClass._it; // Error
@@ -635,7 +635,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                              ^^^" in privateInlineClass.{<unresolved>}_it = 42;
 }
 
 library;
@@ -692,11 +692,11 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^^" 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'.
 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;
+             ^^^" in #this.{<unresolved>}_it = 42;
 }
 static extension-type-member method PrivateInlineClass|get#test(lowered final self2::PrivateInlineClass /* = core::int */ #this) → () → void
   return () → void => self2::PrivateInlineClass|test(#this);
diff --git a/pkg/front_end/testcases/extension_types/field_access.dart.weak.transformed.expect b/pkg/front_end/testcases/extension_types/field_access.dart.weak.transformed.expect
index 3bd75a71cf7..e182e96b608 100644
--- a/pkg/front_end/testcases/extension_types/field_access.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/field_access.dart.weak.transformed.expect
@@ -343,11 +343,11 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^" 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'.
 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;
+             ^^" in #this.{<unresolved>}it = 42;
 }
 static extension-type-member method InlineClass|get#test(lowered final self::InlineClass /* = core::int */ #this) → () → void
   return () → void => self::InlineClass|test(#this);
@@ -371,11 +371,11 @@ Try changing the operand or remove the type arguments.
   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>'.
 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;
+                  ^^" 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>'.
 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;
+             ^^" in #this.{<unresolved>}it = t;
 }
 static extension-type-member method GenericInlineClass|get#test<T extends core::Object? = dynamic>(lowered final self::GenericInlineClass<self::GenericInlineClass|get#test::T%>% /* = self::GenericInlineClass|get#test::T% */ #this) → (self::GenericInlineClass|get#test::T%) → void
   return (self::GenericInlineClass|get#test::T% t) → void => self::GenericInlineClass|test<self::GenericInlineClass|get#test::T%>(#this, t);
@@ -399,11 +399,11 @@ Try changing the operand or remove the type arguments.
   () → 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>'.
 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;
+                  ^^" 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>'.
 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;
+             ^^" in #this.{<unresolved>}it = t;
   self::FunctionInlineClass|test::T% d1 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
   self::FunctionInlineClass|test::T% d2 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
   self::FunctionInlineClass|test::T% d3 = (#this as{Unchecked} () → self::FunctionInlineClass|test::T%)(){() → self::FunctionInlineClass|test::T%};
@@ -427,14 +427,14 @@ static extension-type-member method GenericFunctionInlineClass|test(lowered fina
   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'.
 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 class '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'.
 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 class '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;
@@ -467,13 +467,13 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^" 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'.
 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;
-  dynamic d1 = (#this as{Unchecked} dynamic){dynamic}.call();
-  dynamic d2 = (#this as{Unchecked} dynamic){dynamic}.call();
+             ^^" in #this.{<unresolved>}it = 42;
+  dynamic d1 = (#this as{Unchecked} dynamic){dynamic}();
+  dynamic d2 = (#this as{Unchecked} dynamic){dynamic}();
   dynamic d3 = (#this as{Unchecked} dynamic){dynamic}.call();
   dynamic d4 = (#this as{Unchecked} dynamic){dynamic}.call();
 }
@@ -509,19 +509,19 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^" 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'.
 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;
+             ^" 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'.
 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";
+                  ^" 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'.
 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";
+             ^" 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'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
     var d1 = this.a(); // Error
@@ -566,7 +566,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                       ^^" in inlineClass.{<unresolved>}it = 42;
   core::String b1 = genericInlineClass as{Unchecked} core::String;
   invalid-type b2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:123:33: Error: The static type of the explicit instantiation operand must be a generic function type but is 'String'.
 Try changing the operand or remove the type arguments.
@@ -575,7 +575,7 @@ Try changing the operand or remove the type arguments.
   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>'.
 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";
+                              ^^" in genericInlineClass.{<unresolved>}it = "42";
   () → core::String c1 = functionInlineClass as{Unchecked} () → core::String;
   invalid-type c2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:128:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'String Function()'.
 Try changing the operand or remove the type arguments.
@@ -586,7 +586,7 @@ Try changing the operand or remove the type arguments.
   () → 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>'.
 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";
+                               ^^" in functionInlineClass.{<unresolved>}it = () → core::String => "42";
   <T extends core::Object? = dynamic>() → T% d1 = genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%;
   () → core::int d2 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
   () → core::int d3 = (genericFunctionInlineClass as{Unchecked} <T extends core::Object? = dynamic>() → T%)<core::int>;
@@ -595,17 +595,17 @@ Try correcting the name to the name of an existing setter, or defining a setter
   <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'.
 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 "";
+                                      ^^" in genericFunctionInlineClass.{<unresolved>}it = <T extends core::Object? = dynamic>() → Never => throw "";
   dynamic e1 = dynamicInlineClass as{Unchecked} dynamic;
   invalid-type e2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:143:33: Error: The static type of the explicit instantiation operand must be a generic function type but is 'dynamic'.
 Try changing the operand or remove the type arguments.
   var e2 = dynamicInlineClass.it<int>; // Error
                                 ^";
-  dynamic e3 = (dynamicInlineClass as{Unchecked} dynamic){dynamic}.call();
+  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'.
 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";
+                              ^^" in dynamicInlineClass.{<unresolved>}it = "42";
   core::int f1 = erroneousInlineClass as{Unchecked} core::int;
   invalid-type f2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:149:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'int'.
 Try changing the operand or remove the type arguments.
@@ -614,7 +614,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                                ^" in erroneousInlineClass.{<unresolved>}a = 42;
   core::String g1 = erroneousInlineClass as{Unchecked} core::String;
   invalid-type g2 = invalid-expression "pkg/front_end/testcases/extension_types/field_access.dart:153:34: Error: The static type of the explicit instantiation operand must be a generic function type but is 'int'.
 Try changing the operand or remove the type arguments.
@@ -623,7 +623,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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";
+                                ^" 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'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named '_it'.
   var h1 = privateInlineClass._it; // Error
@@ -635,7 +635,7 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                              ^^^" in privateInlineClass.{<unresolved>}_it = 42;
 }
 
 library;
@@ -692,11 +692,11 @@ Try changing the operand or remove the type arguments.
   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'.
 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;
+                  ^^^" 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'.
 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;
+             ^^^" in #this.{<unresolved>}_it = 42;
 }
 static extension-type-member method PrivateInlineClass|get#test(lowered final self2::PrivateInlineClass /* = core::int */ #this) → () → void
   return () → void => self2::PrivateInlineClass|test(#this);
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 a02f194c0fe..a7bdcb15524 100644
--- a/pkg/front_end/testcases/extension_types/issue53720.dart.strong.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720.dart.strong.expect
@@ -43,5 +43,5 @@ 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'.
 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;
+        ^" 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 a02f194c0fe..a7bdcb15524 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
@@ -43,5 +43,5 @@ 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'.
 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;
+        ^" in self::E2|constructor#(1).{<unresolved>}m = 10;
 }
diff --git a/pkg/front_end/testcases/extension_types/issue53720.dart.weak.expect b/pkg/front_end/testcases/extension_types/issue53720.dart.weak.expect
index a02f194c0fe..a7bdcb15524 100644
--- a/pkg/front_end/testcases/extension_types/issue53720.dart.weak.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720.dart.weak.expect
@@ -43,5 +43,5 @@ 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'.
 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;
+        ^" in self::E2|constructor#(1).{<unresolved>}m = 10;
 }
diff --git a/pkg/front_end/testcases/extension_types/issue53720.dart.weak.modular.expect b/pkg/front_end/testcases/extension_types/issue53720.dart.weak.modular.expect
index a02f194c0fe..a7bdcb15524 100644
--- a/pkg/front_end/testcases/extension_types/issue53720.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720.dart.weak.modular.expect
@@ -43,5 +43,5 @@ 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'.
 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;
+        ^" in self::E2|constructor#(1).{<unresolved>}m = 10;
 }
diff --git a/pkg/front_end/testcases/extension_types/issue53720.dart.weak.transformed.expect b/pkg/front_end/testcases/extension_types/issue53720.dart.weak.transformed.expect
index a02f194c0fe..a7bdcb15524 100644
--- a/pkg/front_end/testcases/extension_types/issue53720.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720.dart.weak.transformed.expect
@@ -43,5 +43,5 @@ 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'.
 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;
+        ^" 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 2a6f44adc01..ff4724c1aa3 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
@@ -67,7 +67,7 @@ static method test() → void {
   invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class '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;
+     ^^" 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'.
 Try correcting the name to the name of an existing method, or defining a method named '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 2a6f44adc01..ff4724c1aa3 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
@@ -67,7 +67,7 @@ static method test() → void {
   invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class '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;
+     ^^" 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'.
 Try correcting the name to the name of an existing method, or defining a method named 'm2'.
diff --git a/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.expect b/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.expect
index 2a6f44adc01..ff4724c1aa3 100644
--- a/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.expect
@@ -67,7 +67,7 @@ static method test() → void {
   invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class '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;
+     ^^" 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'.
 Try correcting the name to the name of an existing method, or defining a method named 'm2'.
diff --git a/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.modular.expect b/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.modular.expect
index 2a6f44adc01..ff4724c1aa3 100644
--- a/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.modular.expect
@@ -67,7 +67,7 @@ static method test() → void {
   invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class '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;
+     ^^" 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'.
 Try correcting the name to the name of an existing method, or defining a method named 'm2'.
diff --git a/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.transformed.expect b/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.transformed.expect
index 2a6f44adc01..ff4724c1aa3 100644
--- a/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/issue53720_2.dart.weak.transformed.expect
@@ -67,7 +67,7 @@ static method test() → void {
   invalid-expression "pkg/front_end/testcases/extension_types/issue53720_2.dart:22:6: Error: The setter 'm1' isn't defined for the class '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;
+     ^^" 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'.
 Try correcting the name to the name of an existing method, or defining a method named '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 53dd1fc5dc7..aa1881c5df2 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
@@ -93,11 +93,11 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class '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;
+         ^^^^^^" 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'.
 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;
+    ^^^^^^" in #this.{<unresolved>}getter = 42;
   core::int i1 = self::InlineClass|method(#this);
   core::int i2 = self::InlineClass|method(#this);
   core::num j1 = self::InlineClass|genericMethod<core::num>(#this, 0);
@@ -151,7 +151,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class '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;
+     ^^^^^^" in ic.{<unresolved>}getter = 42;
   core::int i = self::InlineClass|method(ic);
   core::num j = self::InlineClass|genericMethod<core::num>(ic, 0);
   core::int k = self::InlineClass|genericMethod<core::int>(ic, 0);
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 1e2e415ccb3..53a64886cc0 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
@@ -93,11 +93,11 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class '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;
+         ^^^^^^" 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'.
 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;
+    ^^^^^^" in #this.{<unresolved>}getter = 42;
   core::int i1 = self::InlineClass|method(#this);
   core::int i2 = self::InlineClass|method(#this);
   core::num j1 = self::InlineClass|genericMethod<core::num>(#this, 0);
@@ -151,7 +151,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class '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;
+     ^^^^^^" in ic.{<unresolved>}getter = 42;
   core::int i = self::InlineClass|method(ic);
   core::num j = self::InlineClass|genericMethod<core::num>(ic, 0);
   core::int k = self::InlineClass|genericMethod<core::int>(ic, 0);
diff --git a/pkg/front_end/testcases/extension_types/method_access.dart.weak.expect b/pkg/front_end/testcases/extension_types/method_access.dart.weak.expect
index 53dd1fc5dc7..aa1881c5df2 100644
--- a/pkg/front_end/testcases/extension_types/method_access.dart.weak.expect
+++ b/pkg/front_end/testcases/extension_types/method_access.dart.weak.expect
@@ -93,11 +93,11 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class '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;
+         ^^^^^^" 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'.
 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;
+    ^^^^^^" in #this.{<unresolved>}getter = 42;
   core::int i1 = self::InlineClass|method(#this);
   core::int i2 = self::InlineClass|method(#this);
   core::num j1 = self::InlineClass|genericMethod<core::num>(#this, 0);
@@ -151,7 +151,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class '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;
+     ^^^^^^" in ic.{<unresolved>}getter = 42;
   core::int i = self::InlineClass|method(ic);
   core::num j = self::InlineClass|genericMethod<core::num>(ic, 0);
   core::int k = self::InlineClass|genericMethod<core::int>(ic, 0);
diff --git a/pkg/front_end/testcases/extension_types/method_access.dart.weak.modular.expect b/pkg/front_end/testcases/extension_types/method_access.dart.weak.modular.expect
index 53dd1fc5dc7..aa1881c5df2 100644
--- a/pkg/front_end/testcases/extension_types/method_access.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extension_types/method_access.dart.weak.modular.expect
@@ -93,11 +93,11 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class '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;
+         ^^^^^^" 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'.
 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;
+    ^^^^^^" in #this.{<unresolved>}getter = 42;
   core::int i1 = self::InlineClass|method(#this);
   core::int i2 = self::InlineClass|method(#this);
   core::num j1 = self::InlineClass|genericMethod<core::num>(#this, 0);
@@ -151,7 +151,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class '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;
+     ^^^^^^" in ic.{<unresolved>}getter = 42;
   core::int i = self::InlineClass|method(ic);
   core::num j = self::InlineClass|genericMethod<core::num>(ic, 0);
   core::int k = self::InlineClass|genericMethod<core::int>(ic, 0);
diff --git a/pkg/front_end/testcases/extension_types/method_access.dart.weak.transformed.expect b/pkg/front_end/testcases/extension_types/method_access.dart.weak.transformed.expect
index 1e2e415ccb3..53a64886cc0 100644
--- a/pkg/front_end/testcases/extension_types/method_access.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/method_access.dart.weak.transformed.expect
@@ -93,11 +93,11 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:29:10: Error: The setter 'getter' isn't defined for the class '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;
+         ^^^^^^" 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'.
 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;
+    ^^^^^^" in #this.{<unresolved>}getter = 42;
   core::int i1 = self::InlineClass|method(#this);
   core::int i2 = self::InlineClass|method(#this);
   core::num j1 = self::InlineClass|genericMethod<core::num>(#this, 0);
@@ -151,7 +151,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/extension_types/method_access.dart:74:6: Error: The setter 'getter' isn't defined for the class '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;
+     ^^^^^^" in ic.{<unresolved>}getter = 42;
   core::int i = self::InlineClass|method(ic);
   core::num j = self::InlineClass|genericMethod<core::num>(ic, 0);
   core::int k = self::InlineClass|genericMethod<core::int>(ic, 0);
diff --git a/pkg/front_end/testcases/extensions/ambiguous.dart.strong.expect b/pkg/front_end/testcases/extensions/ambiguous.dart.strong.expect
index 144b4fb04d1..ff1a8f26fb5 100644
--- a/pkg/front_end/testcases/extensions/ambiguous.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/ambiguous.dart.strong.expect
@@ -225,12 +225,12 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.getter = 42;
-    ^^^^^^" in c{<unresolved>}.getter = 42;
+    ^^^^^^" in c.{<unresolved>}getter = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:33:5: Error: The property 'setter' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.setter = 42;
-    ^^^^^^" in c{<unresolved>}.setter = 42;
+    ^^^^^^" in c.{<unresolved>}setter = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:34:5: Error: The property 'property' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -240,7 +240,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.property = 42;
-    ^^^^^^^^" in c{<unresolved>}.property = 42;
+    ^^^^^^^^" in c.{<unresolved>}property = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:36:5: Error: The operator '+' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
diff --git a/pkg/front_end/testcases/extensions/ambiguous.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/ambiguous.dart.strong.transformed.expect
index 144b4fb04d1..ff1a8f26fb5 100644
--- a/pkg/front_end/testcases/extensions/ambiguous.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/ambiguous.dart.strong.transformed.expect
@@ -225,12 +225,12 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.getter = 42;
-    ^^^^^^" in c{<unresolved>}.getter = 42;
+    ^^^^^^" in c.{<unresolved>}getter = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:33:5: Error: The property 'setter' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.setter = 42;
-    ^^^^^^" in c{<unresolved>}.setter = 42;
+    ^^^^^^" in c.{<unresolved>}setter = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:34:5: Error: The property 'property' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -240,7 +240,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.property = 42;
-    ^^^^^^^^" in c{<unresolved>}.property = 42;
+    ^^^^^^^^" in c.{<unresolved>}property = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:36:5: Error: The operator '+' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
diff --git a/pkg/front_end/testcases/extensions/ambiguous.dart.weak.expect b/pkg/front_end/testcases/extensions/ambiguous.dart.weak.expect
index 144b4fb04d1..ff1a8f26fb5 100644
--- a/pkg/front_end/testcases/extensions/ambiguous.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/ambiguous.dart.weak.expect
@@ -225,12 +225,12 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.getter = 42;
-    ^^^^^^" in c{<unresolved>}.getter = 42;
+    ^^^^^^" in c.{<unresolved>}getter = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:33:5: Error: The property 'setter' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.setter = 42;
-    ^^^^^^" in c{<unresolved>}.setter = 42;
+    ^^^^^^" in c.{<unresolved>}setter = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:34:5: Error: The property 'property' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -240,7 +240,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.property = 42;
-    ^^^^^^^^" in c{<unresolved>}.property = 42;
+    ^^^^^^^^" in c.{<unresolved>}property = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:36:5: Error: The operator '+' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
diff --git a/pkg/front_end/testcases/extensions/ambiguous.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/ambiguous.dart.weak.modular.expect
index 144b4fb04d1..ff1a8f26fb5 100644
--- a/pkg/front_end/testcases/extensions/ambiguous.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/ambiguous.dart.weak.modular.expect
@@ -225,12 +225,12 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.getter = 42;
-    ^^^^^^" in c{<unresolved>}.getter = 42;
+    ^^^^^^" in c.{<unresolved>}getter = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:33:5: Error: The property 'setter' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.setter = 42;
-    ^^^^^^" in c{<unresolved>}.setter = 42;
+    ^^^^^^" in c.{<unresolved>}setter = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:34:5: Error: The property 'property' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -240,7 +240,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.property = 42;
-    ^^^^^^^^" in c{<unresolved>}.property = 42;
+    ^^^^^^^^" in c.{<unresolved>}property = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:36:5: Error: The operator '+' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
diff --git a/pkg/front_end/testcases/extensions/ambiguous.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/ambiguous.dart.weak.transformed.expect
index 144b4fb04d1..ff1a8f26fb5 100644
--- a/pkg/front_end/testcases/extensions/ambiguous.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/ambiguous.dart.weak.transformed.expect
@@ -225,12 +225,12 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.getter = 42;
-    ^^^^^^" in c{<unresolved>}.getter = 42;
+    ^^^^^^" in c.{<unresolved>}getter = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:33:5: Error: The property 'setter' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.setter = 42;
-    ^^^^^^" in c{<unresolved>}.setter = 42;
+    ^^^^^^" in c.{<unresolved>}setter = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:34:5: Error: The property 'property' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -240,7 +240,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.property = 42;
-    ^^^^^^^^" in c{<unresolved>}.property = 42;
+    ^^^^^^^^" in c.{<unresolved>}property = 42;
   invalid-expression "pkg/front_end/testcases/extensions/ambiguous.dart:36:5: Error: The operator '+' is defined in multiple extensions for 'C' and neither is more specific.
  - 'C' is from 'pkg/front_end/testcases/extensions/ambiguous.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
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 5cef7e6a384..89ffa2d2624 100644
--- a/pkg/front_end/testcases/extensions/call_collision.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/call_collision.dart.strong.expect
@@ -51,12 +51,12 @@ static method method(core::Function f1, () → void f2, self::Class c1, self::Cl
  - '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;
+     ^^^^" 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()'.
 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;
+     ^^^^" 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'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
@@ -67,6 +67,6 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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.
-     ^^^^" in c2{<unresolved>}.call = 0;
+     ^^^^" in c2.{<unresolved>}call = 0;
   self::_extension#1|call(c2);
 }
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 5cef7e6a384..89ffa2d2624 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
@@ -51,12 +51,12 @@ static method method(core::Function f1, () → void f2, self::Class c1, self::Cl
  - '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;
+     ^^^^" 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()'.
 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;
+     ^^^^" 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'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
@@ -67,6 +67,6 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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.
-     ^^^^" in c2{<unresolved>}.call = 0;
+     ^^^^" in c2.{<unresolved>}call = 0;
   self::_extension#1|call(c2);
 }
diff --git a/pkg/front_end/testcases/extensions/call_collision.dart.weak.expect b/pkg/front_end/testcases/extensions/call_collision.dart.weak.expect
index 5cef7e6a384..89ffa2d2624 100644
--- a/pkg/front_end/testcases/extensions/call_collision.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/call_collision.dart.weak.expect
@@ -51,12 +51,12 @@ static method method(core::Function f1, () → void f2, self::Class c1, self::Cl
  - '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;
+     ^^^^" 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()'.
 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;
+     ^^^^" 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'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
@@ -67,6 +67,6 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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.
-     ^^^^" in c2{<unresolved>}.call = 0;
+     ^^^^" in c2.{<unresolved>}call = 0;
   self::_extension#1|call(c2);
 }
diff --git a/pkg/front_end/testcases/extensions/call_collision.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/call_collision.dart.weak.modular.expect
index 5cef7e6a384..89ffa2d2624 100644
--- a/pkg/front_end/testcases/extensions/call_collision.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/call_collision.dart.weak.modular.expect
@@ -51,12 +51,12 @@ static method method(core::Function f1, () → void f2, self::Class c1, self::Cl
  - '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;
+     ^^^^" 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()'.
 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;
+     ^^^^" 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'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
@@ -67,6 +67,6 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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.
-     ^^^^" in c2{<unresolved>}.call = 0;
+     ^^^^" in c2.{<unresolved>}call = 0;
   self::_extension#1|call(c2);
 }
diff --git a/pkg/front_end/testcases/extensions/call_collision.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/call_collision.dart.weak.transformed.expect
index 5cef7e6a384..89ffa2d2624 100644
--- a/pkg/front_end/testcases/extensions/call_collision.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/call_collision.dart.weak.transformed.expect
@@ -51,12 +51,12 @@ static method method(core::Function f1, () → void f2, self::Class c1, self::Cl
  - '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;
+     ^^^^" 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()'.
 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;
+     ^^^^" 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'.
  - 'Class' is from 'pkg/front_end/testcases/extensions/call_collision.dart'.
@@ -67,6 +67,6 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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.
-     ^^^^" in c2{<unresolved>}.call = 0;
+     ^^^^" in c2.{<unresolved>}call = 0;
   self::_extension#1|call(c2);
 }
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 c5230700914..a0ff2cfaad8 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
@@ -79,7 +79,7 @@ static method errors() → dynamic {
   invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class '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;
+     ^^^^^^^^" in "".{<unresolved>}hashCode = 42;
   value = invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:29:14: Error: A value of type 'Type' can't be assigned to a variable of type 'int'.
  - 'Type' is from 'dart:core'.
   value = \"\".runtimeType;
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 a85564b5f44..73d0554048d 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
@@ -79,7 +79,7 @@ static method errors() → dynamic {
   invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class '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;
+     ^^^^^^^^" in "".{<unresolved>}hashCode = 42;
   value = invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:29:14: Error: A value of type 'Type' can't be assigned to a variable of type 'int'.
  - 'Type' is from 'dart:core'.
   value = \"\".runtimeType;
diff --git a/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.expect b/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.expect
index c5230700914..a0ff2cfaad8 100644
--- a/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.expect
@@ -79,7 +79,7 @@ static method errors() → dynamic {
   invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class '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;
+     ^^^^^^^^" in "".{<unresolved>}hashCode = 42;
   value = invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:29:14: Error: A value of type 'Type' can't be assigned to a variable of type 'int'.
  - 'Type' is from 'dart:core'.
   value = \"\".runtimeType;
diff --git a/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.modular.expect
index c5230700914..a0ff2cfaad8 100644
--- a/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.modular.expect
@@ -79,7 +79,7 @@ static method errors() → dynamic {
   invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class '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;
+     ^^^^^^^^" in "".{<unresolved>}hashCode = 42;
   value = invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:29:14: Error: A value of type 'Type' can't be assigned to a variable of type 'int'.
  - 'Type' is from 'dart:core'.
   value = \"\".runtimeType;
diff --git a/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.transformed.expect
index a85564b5f44..73d0554048d 100644
--- a/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/conflict_with_object.dart.weak.transformed.expect
@@ -79,7 +79,7 @@ static method errors() → dynamic {
   invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:28:6: Error: The setter 'hashCode' isn't defined for the class '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;
+     ^^^^^^^^" in "".{<unresolved>}hashCode = 42;
   value = invalid-expression "pkg/front_end/testcases/extensions/conflict_with_object.dart:29:14: Error: A value of type 'Type' can't be assigned to a variable of type 'int'.
  - 'Type' is from 'dart:core'.
   value = \"\".runtimeType;
diff --git a/pkg/front_end/testcases/extensions/default_values.dart.strong.expect b/pkg/front_end/testcases/extensions/default_values.dart.strong.expect
index 2df7129b293..303756732a5 100644
--- a/pkg/front_end/testcases/extensions/default_values.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/default_values.dart.strong.expect
@@ -31,7 +31,7 @@ static extension-member method Extension|method2(lowered final self::Class #this
 static extension-member method Extension|get#method2(lowered final self::Class #this) → ({b: dynamic}) → dynamic
   return ({dynamic b = #C3}) → dynamic => self::Extension|method2(#this, b: b);
 static extension-member method Extension|method3(lowered final self::Class #this, {dynamic c = #C4}) → dynamic
-  return c{dynamic}.call();
+  return c{dynamic}();
 static extension-member method Extension|get#method3(lowered final self::Class #this) → ({c: dynamic}) → dynamic
   return ({dynamic c = #C4}) → dynamic => self::Extension|method3(#this, c: c);
 static extension-member method Extension|staticMethod() → dynamic
diff --git a/pkg/front_end/testcases/extensions/default_values.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/default_values.dart.strong.transformed.expect
index 2df7129b293..303756732a5 100644
--- a/pkg/front_end/testcases/extensions/default_values.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/default_values.dart.strong.transformed.expect
@@ -31,7 +31,7 @@ static extension-member method Extension|method2(lowered final self::Class #this
 static extension-member method Extension|get#method2(lowered final self::Class #this) → ({b: dynamic}) → dynamic
   return ({dynamic b = #C3}) → dynamic => self::Extension|method2(#this, b: b);
 static extension-member method Extension|method3(lowered final self::Class #this, {dynamic c = #C4}) → dynamic
-  return c{dynamic}.call();
+  return c{dynamic}();
 static extension-member method Extension|get#method3(lowered final self::Class #this) → ({c: dynamic}) → dynamic
   return ({dynamic c = #C4}) → dynamic => self::Extension|method3(#this, c: c);
 static extension-member method Extension|staticMethod() → dynamic
diff --git a/pkg/front_end/testcases/extensions/default_values.dart.weak.expect b/pkg/front_end/testcases/extensions/default_values.dart.weak.expect
index 2df7129b293..303756732a5 100644
--- a/pkg/front_end/testcases/extensions/default_values.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/default_values.dart.weak.expect
@@ -31,7 +31,7 @@ static extension-member method Extension|method2(lowered final self::Class #this
 static extension-member method Extension|get#method2(lowered final self::Class #this) → ({b: dynamic}) → dynamic
   return ({dynamic b = #C3}) → dynamic => self::Extension|method2(#this, b: b);
 static extension-member method Extension|method3(lowered final self::Class #this, {dynamic c = #C4}) → dynamic
-  return c{dynamic}.call();
+  return c{dynamic}();
 static extension-member method Extension|get#method3(lowered final self::Class #this) → ({c: dynamic}) → dynamic
   return ({dynamic c = #C4}) → dynamic => self::Extension|method3(#this, c: c);
 static extension-member method Extension|staticMethod() → dynamic
diff --git a/pkg/front_end/testcases/extensions/default_values.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/default_values.dart.weak.modular.expect
index 2df7129b293..303756732a5 100644
--- a/pkg/front_end/testcases/extensions/default_values.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/default_values.dart.weak.modular.expect
@@ -31,7 +31,7 @@ static extension-member method Extension|method2(lowered final self::Class #this
 static extension-member method Extension|get#method2(lowered final self::Class #this) → ({b: dynamic}) → dynamic
   return ({dynamic b = #C3}) → dynamic => self::Extension|method2(#this, b: b);
 static extension-member method Extension|method3(lowered final self::Class #this, {dynamic c = #C4}) → dynamic
-  return c{dynamic}.call();
+  return c{dynamic}();
 static extension-member method Extension|get#method3(lowered final self::Class #this) → ({c: dynamic}) → dynamic
   return ({dynamic c = #C4}) → dynamic => self::Extension|method3(#this, c: c);
 static extension-member method Extension|staticMethod() → dynamic
diff --git a/pkg/front_end/testcases/extensions/default_values.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/default_values.dart.weak.transformed.expect
index 2df7129b293..303756732a5 100644
--- a/pkg/front_end/testcases/extensions/default_values.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/default_values.dart.weak.transformed.expect
@@ -31,7 +31,7 @@ static extension-member method Extension|method2(lowered final self::Class #this
 static extension-member method Extension|get#method2(lowered final self::Class #this) → ({b: dynamic}) → dynamic
   return ({dynamic b = #C3}) → dynamic => self::Extension|method2(#this, b: b);
 static extension-member method Extension|method3(lowered final self::Class #this, {dynamic c = #C4}) → dynamic
-  return c{dynamic}.call();
+  return c{dynamic}();
 static extension-member method Extension|get#method3(lowered final self::Class #this) → ({c: dynamic}) → dynamic
   return ({dynamic c = #C4}) → dynamic => self::Extension|method3(#this, c: c);
 static extension-member method Extension|staticMethod() → dynamic
diff --git a/pkg/front_end/testcases/extensions/direct_instance_access.dart.strong.expect b/pkg/front_end/testcases/extensions/direct_instance_access.dart.strong.expect
index ee9a3945891..4f3296750c6 100644
--- a/pkg/front_end/testcases/extensions/direct_instance_access.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/direct_instance_access.dart.strong.expect
@@ -125,12 +125,12 @@ static extension-member method Extension|tearOffs(lowered final self::Class #thi
   tearOffNamed(value: value){({value: dynamic}) → dynamic};
 }
 static extension-member method Extension|getterCalls(lowered final self::Class #this, dynamic value) → dynamic {
-  self::Extension|get#tearOffGetterNoArgs(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterRequired(#this){dynamic}.call(value);
-  self::Extension|get#tearOffGetterOptional(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterOptional(#this){dynamic}.call(value);
-  self::Extension|get#tearOffGetterNamed(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterNamed(#this){dynamic}.call(value: value);
+  self::Extension|get#tearOffGetterNoArgs(#this){dynamic}();
+  self::Extension|get#tearOffGetterRequired(#this){dynamic}(value);
+  self::Extension|get#tearOffGetterOptional(#this){dynamic}();
+  self::Extension|get#tearOffGetterOptional(#this){dynamic}(value);
+  self::Extension|get#tearOffGetterNamed(#this){dynamic}();
+  self::Extension|get#tearOffGetterNamed(#this){dynamic}(value: value);
 }
 static extension-member method Extension|get#getterCalls(lowered final self::Class #this) → (dynamic) → dynamic
   return (dynamic value) → dynamic => self::Extension|getterCalls(#this, value);
@@ -246,27 +246,27 @@ static extension-member method GenericExtension|tearOffs<T extends core::Object?
 static extension-member method GenericExtension|get#tearOffs<T extends core::Object? = dynamic>(lowered final self::GenericClass<self::GenericExtension|get#tearOffs::T%> #this) → <S extends self::GenericExtension|get#tearOffs::T% = dynamic>(S%) → dynamic
   return <S extends self::GenericExtension|get#tearOffs::T% = dynamic>(S% value) → dynamic => self::GenericExtension|tearOffs<self::GenericExtension|get#tearOffs::T%, S%>(#this, value);
 static extension-member method GenericExtension|getterCalls<T extends core::Object? = dynamic, S extends self::GenericExtension|getterCalls::T% = dynamic>(lowered final self::GenericClass<self::GenericExtension|getterCalls::T%> #this, self::GenericExtension|getterCalls::S% value) → dynamic {
-  self::GenericExtension|get#tearOffGetterNoArgs<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value: value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value: value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value: value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value: value);
+  self::GenericExtension|get#tearOffGetterNoArgs<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value: value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value: value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value: value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value: value);
 }
 static extension-member method GenericExtension|get#getterCalls<T extends core::Object? = dynamic>(lowered final self::GenericClass<self::GenericExtension|get#getterCalls::T%> #this) → <S extends self::GenericExtension|get#getterCalls::T% = dynamic>(S%) → dynamic
   return <S extends self::GenericExtension|get#getterCalls::T% = dynamic>(S% value) → dynamic => self::GenericExtension|getterCalls<self::GenericExtension|get#getterCalls::T%, S%>(#this, value);
diff --git a/pkg/front_end/testcases/extensions/direct_instance_access.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/direct_instance_access.dart.strong.transformed.expect
index ee9a3945891..4f3296750c6 100644
--- a/pkg/front_end/testcases/extensions/direct_instance_access.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/direct_instance_access.dart.strong.transformed.expect
@@ -125,12 +125,12 @@ static extension-member method Extension|tearOffs(lowered final self::Class #thi
   tearOffNamed(value: value){({value: dynamic}) → dynamic};
 }
 static extension-member method Extension|getterCalls(lowered final self::Class #this, dynamic value) → dynamic {
-  self::Extension|get#tearOffGetterNoArgs(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterRequired(#this){dynamic}.call(value);
-  self::Extension|get#tearOffGetterOptional(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterOptional(#this){dynamic}.call(value);
-  self::Extension|get#tearOffGetterNamed(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterNamed(#this){dynamic}.call(value: value);
+  self::Extension|get#tearOffGetterNoArgs(#this){dynamic}();
+  self::Extension|get#tearOffGetterRequired(#this){dynamic}(value);
+  self::Extension|get#tearOffGetterOptional(#this){dynamic}();
+  self::Extension|get#tearOffGetterOptional(#this){dynamic}(value);
+  self::Extension|get#tearOffGetterNamed(#this){dynamic}();
+  self::Extension|get#tearOffGetterNamed(#this){dynamic}(value: value);
 }
 static extension-member method Extension|get#getterCalls(lowered final self::Class #this) → (dynamic) → dynamic
   return (dynamic value) → dynamic => self::Extension|getterCalls(#this, value);
@@ -246,27 +246,27 @@ static extension-member method GenericExtension|tearOffs<T extends core::Object?
 static extension-member method GenericExtension|get#tearOffs<T extends core::Object? = dynamic>(lowered final self::GenericClass<self::GenericExtension|get#tearOffs::T%> #this) → <S extends self::GenericExtension|get#tearOffs::T% = dynamic>(S%) → dynamic
   return <S extends self::GenericExtension|get#tearOffs::T% = dynamic>(S% value) → dynamic => self::GenericExtension|tearOffs<self::GenericExtension|get#tearOffs::T%, S%>(#this, value);
 static extension-member method GenericExtension|getterCalls<T extends core::Object? = dynamic, S extends self::GenericExtension|getterCalls::T% = dynamic>(lowered final self::GenericClass<self::GenericExtension|getterCalls::T%> #this, self::GenericExtension|getterCalls::S% value) → dynamic {
-  self::GenericExtension|get#tearOffGetterNoArgs<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value: value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value: value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value: value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value: value);
+  self::GenericExtension|get#tearOffGetterNoArgs<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value: value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value: value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value: value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value: value);
 }
 static extension-member method GenericExtension|get#getterCalls<T extends core::Object? = dynamic>(lowered final self::GenericClass<self::GenericExtension|get#getterCalls::T%> #this) → <S extends self::GenericExtension|get#getterCalls::T% = dynamic>(S%) → dynamic
   return <S extends self::GenericExtension|get#getterCalls::T% = dynamic>(S% value) → dynamic => self::GenericExtension|getterCalls<self::GenericExtension|get#getterCalls::T%, S%>(#this, value);
diff --git a/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.expect b/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.expect
index ee9a3945891..4f3296750c6 100644
--- a/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.expect
@@ -125,12 +125,12 @@ static extension-member method Extension|tearOffs(lowered final self::Class #thi
   tearOffNamed(value: value){({value: dynamic}) → dynamic};
 }
 static extension-member method Extension|getterCalls(lowered final self::Class #this, dynamic value) → dynamic {
-  self::Extension|get#tearOffGetterNoArgs(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterRequired(#this){dynamic}.call(value);
-  self::Extension|get#tearOffGetterOptional(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterOptional(#this){dynamic}.call(value);
-  self::Extension|get#tearOffGetterNamed(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterNamed(#this){dynamic}.call(value: value);
+  self::Extension|get#tearOffGetterNoArgs(#this){dynamic}();
+  self::Extension|get#tearOffGetterRequired(#this){dynamic}(value);
+  self::Extension|get#tearOffGetterOptional(#this){dynamic}();
+  self::Extension|get#tearOffGetterOptional(#this){dynamic}(value);
+  self::Extension|get#tearOffGetterNamed(#this){dynamic}();
+  self::Extension|get#tearOffGetterNamed(#this){dynamic}(value: value);
 }
 static extension-member method Extension|get#getterCalls(lowered final self::Class #this) → (dynamic) → dynamic
   return (dynamic value) → dynamic => self::Extension|getterCalls(#this, value);
@@ -246,27 +246,27 @@ static extension-member method GenericExtension|tearOffs<T extends core::Object?
 static extension-member method GenericExtension|get#tearOffs<T extends core::Object? = dynamic>(lowered final self::GenericClass<self::GenericExtension|get#tearOffs::T%> #this) → <S extends self::GenericExtension|get#tearOffs::T% = dynamic>(S%) → dynamic
   return <S extends self::GenericExtension|get#tearOffs::T% = dynamic>(S% value) → dynamic => self::GenericExtension|tearOffs<self::GenericExtension|get#tearOffs::T%, S%>(#this, value);
 static extension-member method GenericExtension|getterCalls<T extends core::Object? = dynamic, S extends self::GenericExtension|getterCalls::T% = dynamic>(lowered final self::GenericClass<self::GenericExtension|getterCalls::T%> #this, self::GenericExtension|getterCalls::S% value) → dynamic {
-  self::GenericExtension|get#tearOffGetterNoArgs<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value: value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value: value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value: value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value: value);
+  self::GenericExtension|get#tearOffGetterNoArgs<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value: value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value: value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value: value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value: value);
 }
 static extension-member method GenericExtension|get#getterCalls<T extends core::Object? = dynamic>(lowered final self::GenericClass<self::GenericExtension|get#getterCalls::T%> #this) → <S extends self::GenericExtension|get#getterCalls::T% = dynamic>(S%) → dynamic
   return <S extends self::GenericExtension|get#getterCalls::T% = dynamic>(S% value) → dynamic => self::GenericExtension|getterCalls<self::GenericExtension|get#getterCalls::T%, S%>(#this, value);
diff --git a/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.modular.expect
index ee9a3945891..4f3296750c6 100644
--- a/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.modular.expect
@@ -125,12 +125,12 @@ static extension-member method Extension|tearOffs(lowered final self::Class #thi
   tearOffNamed(value: value){({value: dynamic}) → dynamic};
 }
 static extension-member method Extension|getterCalls(lowered final self::Class #this, dynamic value) → dynamic {
-  self::Extension|get#tearOffGetterNoArgs(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterRequired(#this){dynamic}.call(value);
-  self::Extension|get#tearOffGetterOptional(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterOptional(#this){dynamic}.call(value);
-  self::Extension|get#tearOffGetterNamed(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterNamed(#this){dynamic}.call(value: value);
+  self::Extension|get#tearOffGetterNoArgs(#this){dynamic}();
+  self::Extension|get#tearOffGetterRequired(#this){dynamic}(value);
+  self::Extension|get#tearOffGetterOptional(#this){dynamic}();
+  self::Extension|get#tearOffGetterOptional(#this){dynamic}(value);
+  self::Extension|get#tearOffGetterNamed(#this){dynamic}();
+  self::Extension|get#tearOffGetterNamed(#this){dynamic}(value: value);
 }
 static extension-member method Extension|get#getterCalls(lowered final self::Class #this) → (dynamic) → dynamic
   return (dynamic value) → dynamic => self::Extension|getterCalls(#this, value);
@@ -246,27 +246,27 @@ static extension-member method GenericExtension|tearOffs<T extends core::Object?
 static extension-member method GenericExtension|get#tearOffs<T extends core::Object? = dynamic>(lowered final self::GenericClass<self::GenericExtension|get#tearOffs::T%> #this) → <S extends self::GenericExtension|get#tearOffs::T% = dynamic>(S%) → dynamic
   return <S extends self::GenericExtension|get#tearOffs::T% = dynamic>(S% value) → dynamic => self::GenericExtension|tearOffs<self::GenericExtension|get#tearOffs::T%, S%>(#this, value);
 static extension-member method GenericExtension|getterCalls<T extends core::Object? = dynamic, S extends self::GenericExtension|getterCalls::T% = dynamic>(lowered final self::GenericClass<self::GenericExtension|getterCalls::T%> #this, self::GenericExtension|getterCalls::S% value) → dynamic {
-  self::GenericExtension|get#tearOffGetterNoArgs<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value: value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value: value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value: value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value: value);
+  self::GenericExtension|get#tearOffGetterNoArgs<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value: value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value: value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value: value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value: value);
 }
 static extension-member method GenericExtension|get#getterCalls<T extends core::Object? = dynamic>(lowered final self::GenericClass<self::GenericExtension|get#getterCalls::T%> #this) → <S extends self::GenericExtension|get#getterCalls::T% = dynamic>(S%) → dynamic
   return <S extends self::GenericExtension|get#getterCalls::T% = dynamic>(S% value) → dynamic => self::GenericExtension|getterCalls<self::GenericExtension|get#getterCalls::T%, S%>(#this, value);
diff --git a/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.transformed.expect
index ee9a3945891..4f3296750c6 100644
--- a/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/direct_instance_access.dart.weak.transformed.expect
@@ -125,12 +125,12 @@ static extension-member method Extension|tearOffs(lowered final self::Class #thi
   tearOffNamed(value: value){({value: dynamic}) → dynamic};
 }
 static extension-member method Extension|getterCalls(lowered final self::Class #this, dynamic value) → dynamic {
-  self::Extension|get#tearOffGetterNoArgs(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterRequired(#this){dynamic}.call(value);
-  self::Extension|get#tearOffGetterOptional(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterOptional(#this){dynamic}.call(value);
-  self::Extension|get#tearOffGetterNamed(#this){dynamic}.call();
-  self::Extension|get#tearOffGetterNamed(#this){dynamic}.call(value: value);
+  self::Extension|get#tearOffGetterNoArgs(#this){dynamic}();
+  self::Extension|get#tearOffGetterRequired(#this){dynamic}(value);
+  self::Extension|get#tearOffGetterOptional(#this){dynamic}();
+  self::Extension|get#tearOffGetterOptional(#this){dynamic}(value);
+  self::Extension|get#tearOffGetterNamed(#this){dynamic}();
+  self::Extension|get#tearOffGetterNamed(#this){dynamic}(value: value);
 }
 static extension-member method Extension|get#getterCalls(lowered final self::Class #this) → (dynamic) → dynamic
   return (dynamic value) → dynamic => self::Extension|getterCalls(#this, value);
@@ -246,27 +246,27 @@ static extension-member method GenericExtension|tearOffs<T extends core::Object?
 static extension-member method GenericExtension|get#tearOffs<T extends core::Object? = dynamic>(lowered final self::GenericClass<self::GenericExtension|get#tearOffs::T%> #this) → <S extends self::GenericExtension|get#tearOffs::T% = dynamic>(S%) → dynamic
   return <S extends self::GenericExtension|get#tearOffs::T% = dynamic>(S% value) → dynamic => self::GenericExtension|tearOffs<self::GenericExtension|get#tearOffs::T%, S%>(#this, value);
 static extension-member method GenericExtension|getterCalls<T extends core::Object? = dynamic, S extends self::GenericExtension|getterCalls::T% = dynamic>(lowered final self::GenericClass<self::GenericExtension|getterCalls::T%> #this, self::GenericExtension|getterCalls::S% value) → dynamic {
-  self::GenericExtension|get#tearOffGetterNoArgs<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value: value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value);
-  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>();
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value);
-  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>();
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call(value: value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::T%>(value: value);
-  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}.call<self::GenericExtension|getterCalls::S%>(value: value);
+  self::GenericExtension|get#tearOffGetterNoArgs<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value: value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value);
+  self::GenericExtension|get#tearOffGetterGenericRequired<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>();
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value);
+  self::GenericExtension|get#tearOffGetterGenericOptional<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>();
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}(value: value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::T%>(value: value);
+  self::GenericExtension|get#tearOffGetterGenericNamed<self::GenericExtension|getterCalls::T%>(#this){dynamic}<self::GenericExtension|getterCalls::S%>(value: value);
 }
 static extension-member method GenericExtension|get#getterCalls<T extends core::Object? = dynamic>(lowered final self::GenericClass<self::GenericExtension|get#getterCalls::T%> #this) → <S extends self::GenericExtension|get#getterCalls::T% = dynamic>(S%) → dynamic
   return <S extends self::GenericExtension|get#getterCalls::T% = dynamic>(S% value) → dynamic => self::GenericExtension|getterCalls<self::GenericExtension|get#getterCalls::T%, S%>(#this, value);
diff --git a/pkg/front_end/testcases/extensions/direct_static_access.dart.strong.expect b/pkg/front_end/testcases/extensions/direct_static_access.dart.strong.expect
index 11452ba2b7e..c993bf53cb3 100644
--- a/pkg/front_end/testcases/extensions/direct_static_access.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/direct_static_access.dart.strong.expect
@@ -128,22 +128,22 @@ static extension-member method Extension|fieldAccessFromStaticContext() → dyna
   self::Extension|property = self::Extension|field;
 }
 static extension-member method Extension|getterCallsFromStaticContext(core::int value) → dynamic {
-  self::Extension|tearOffGetterNoArgs{dynamic}.call();
-  self::Extension|tearOffGetterRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterOptional{dynamic}.call();
-  self::Extension|tearOffGetterOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterNamed{dynamic}.call();
-  self::Extension|tearOffGetterNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call<core::int>(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<core::int>();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<core::int>(value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<core::int>();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<core::int>(value: value);
+  self::Extension|tearOffGetterNoArgs{dynamic}();
+  self::Extension|tearOffGetterRequired{dynamic}(value);
+  self::Extension|tearOffGetterOptional{dynamic}();
+  self::Extension|tearOffGetterOptional{dynamic}(value);
+  self::Extension|tearOffGetterNamed{dynamic}();
+  self::Extension|tearOffGetterNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}(value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}<core::int>(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}();
+  self::Extension|tearOffGetterGenericOptional{dynamic}<core::int>();
+  self::Extension|tearOffGetterGenericOptional{dynamic}(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}<core::int>(value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}();
+  self::Extension|tearOffGetterGenericNamed{dynamic}<core::int>();
+  self::Extension|tearOffGetterGenericNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}<core::int>(value: value);
 }
 static extension-member method Extension|invocationsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|invocationsFromInstanceContext::T%> #this, self::Extension|invocationsFromInstanceContext::T% value) → dynamic {
   self::Extension|readGetter();
@@ -199,22 +199,22 @@ static extension-member method Extension|fieldAccessFromInstanceContext<T extend
 static extension-member method Extension|get#fieldAccessFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|get#fieldAccessFromInstanceContext::T%> #this) → () → dynamic
   return () → dynamic => self::Extension|fieldAccessFromInstanceContext<self::Extension|get#fieldAccessFromInstanceContext::T%>(#this);
 static extension-member method Extension|getterCallsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|getterCallsFromInstanceContext::T%> #this, self::Extension|getterCallsFromInstanceContext::T% value) → dynamic {
-  self::Extension|tearOffGetterNoArgs{dynamic}.call();
-  self::Extension|tearOffGetterRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterOptional{dynamic}.call();
-  self::Extension|tearOffGetterOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterNamed{dynamic}.call();
-  self::Extension|tearOffGetterNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value: value);
+  self::Extension|tearOffGetterNoArgs{dynamic}();
+  self::Extension|tearOffGetterRequired{dynamic}(value);
+  self::Extension|tearOffGetterOptional{dynamic}();
+  self::Extension|tearOffGetterOptional{dynamic}(value);
+  self::Extension|tearOffGetterNamed{dynamic}();
+  self::Extension|tearOffGetterNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}(value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}();
+  self::Extension|tearOffGetterGenericOptional{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>();
+  self::Extension|tearOffGetterGenericOptional{dynamic}(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}();
+  self::Extension|tearOffGetterGenericNamed{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>();
+  self::Extension|tearOffGetterGenericNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value: value);
 }
 static extension-member method Extension|get#getterCallsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|get#getterCallsFromInstanceContext::T%> #this) → (self::Extension|get#getterCallsFromInstanceContext::T%) → dynamic
   return (self::Extension|get#getterCallsFromInstanceContext::T% value) → dynamic => self::Extension|getterCallsFromInstanceContext<self::Extension|get#getterCallsFromInstanceContext::T%>(#this, value);
diff --git a/pkg/front_end/testcases/extensions/direct_static_access.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/direct_static_access.dart.strong.transformed.expect
index 11452ba2b7e..c993bf53cb3 100644
--- a/pkg/front_end/testcases/extensions/direct_static_access.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/direct_static_access.dart.strong.transformed.expect
@@ -128,22 +128,22 @@ static extension-member method Extension|fieldAccessFromStaticContext() → dyna
   self::Extension|property = self::Extension|field;
 }
 static extension-member method Extension|getterCallsFromStaticContext(core::int value) → dynamic {
-  self::Extension|tearOffGetterNoArgs{dynamic}.call();
-  self::Extension|tearOffGetterRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterOptional{dynamic}.call();
-  self::Extension|tearOffGetterOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterNamed{dynamic}.call();
-  self::Extension|tearOffGetterNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call<core::int>(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<core::int>();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<core::int>(value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<core::int>();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<core::int>(value: value);
+  self::Extension|tearOffGetterNoArgs{dynamic}();
+  self::Extension|tearOffGetterRequired{dynamic}(value);
+  self::Extension|tearOffGetterOptional{dynamic}();
+  self::Extension|tearOffGetterOptional{dynamic}(value);
+  self::Extension|tearOffGetterNamed{dynamic}();
+  self::Extension|tearOffGetterNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}(value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}<core::int>(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}();
+  self::Extension|tearOffGetterGenericOptional{dynamic}<core::int>();
+  self::Extension|tearOffGetterGenericOptional{dynamic}(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}<core::int>(value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}();
+  self::Extension|tearOffGetterGenericNamed{dynamic}<core::int>();
+  self::Extension|tearOffGetterGenericNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}<core::int>(value: value);
 }
 static extension-member method Extension|invocationsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|invocationsFromInstanceContext::T%> #this, self::Extension|invocationsFromInstanceContext::T% value) → dynamic {
   self::Extension|readGetter();
@@ -199,22 +199,22 @@ static extension-member method Extension|fieldAccessFromInstanceContext<T extend
 static extension-member method Extension|get#fieldAccessFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|get#fieldAccessFromInstanceContext::T%> #this) → () → dynamic
   return () → dynamic => self::Extension|fieldAccessFromInstanceContext<self::Extension|get#fieldAccessFromInstanceContext::T%>(#this);
 static extension-member method Extension|getterCallsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|getterCallsFromInstanceContext::T%> #this, self::Extension|getterCallsFromInstanceContext::T% value) → dynamic {
-  self::Extension|tearOffGetterNoArgs{dynamic}.call();
-  self::Extension|tearOffGetterRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterOptional{dynamic}.call();
-  self::Extension|tearOffGetterOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterNamed{dynamic}.call();
-  self::Extension|tearOffGetterNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value: value);
+  self::Extension|tearOffGetterNoArgs{dynamic}();
+  self::Extension|tearOffGetterRequired{dynamic}(value);
+  self::Extension|tearOffGetterOptional{dynamic}();
+  self::Extension|tearOffGetterOptional{dynamic}(value);
+  self::Extension|tearOffGetterNamed{dynamic}();
+  self::Extension|tearOffGetterNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}(value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}();
+  self::Extension|tearOffGetterGenericOptional{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>();
+  self::Extension|tearOffGetterGenericOptional{dynamic}(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}();
+  self::Extension|tearOffGetterGenericNamed{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>();
+  self::Extension|tearOffGetterGenericNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value: value);
 }
 static extension-member method Extension|get#getterCallsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|get#getterCallsFromInstanceContext::T%> #this) → (self::Extension|get#getterCallsFromInstanceContext::T%) → dynamic
   return (self::Extension|get#getterCallsFromInstanceContext::T% value) → dynamic => self::Extension|getterCallsFromInstanceContext<self::Extension|get#getterCallsFromInstanceContext::T%>(#this, value);
diff --git a/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.expect b/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.expect
index 11452ba2b7e..c993bf53cb3 100644
--- a/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.expect
@@ -128,22 +128,22 @@ static extension-member method Extension|fieldAccessFromStaticContext() → dyna
   self::Extension|property = self::Extension|field;
 }
 static extension-member method Extension|getterCallsFromStaticContext(core::int value) → dynamic {
-  self::Extension|tearOffGetterNoArgs{dynamic}.call();
-  self::Extension|tearOffGetterRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterOptional{dynamic}.call();
-  self::Extension|tearOffGetterOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterNamed{dynamic}.call();
-  self::Extension|tearOffGetterNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call<core::int>(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<core::int>();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<core::int>(value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<core::int>();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<core::int>(value: value);
+  self::Extension|tearOffGetterNoArgs{dynamic}();
+  self::Extension|tearOffGetterRequired{dynamic}(value);
+  self::Extension|tearOffGetterOptional{dynamic}();
+  self::Extension|tearOffGetterOptional{dynamic}(value);
+  self::Extension|tearOffGetterNamed{dynamic}();
+  self::Extension|tearOffGetterNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}(value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}<core::int>(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}();
+  self::Extension|tearOffGetterGenericOptional{dynamic}<core::int>();
+  self::Extension|tearOffGetterGenericOptional{dynamic}(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}<core::int>(value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}();
+  self::Extension|tearOffGetterGenericNamed{dynamic}<core::int>();
+  self::Extension|tearOffGetterGenericNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}<core::int>(value: value);
 }
 static extension-member method Extension|invocationsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|invocationsFromInstanceContext::T%> #this, self::Extension|invocationsFromInstanceContext::T% value) → dynamic {
   self::Extension|readGetter();
@@ -199,22 +199,22 @@ static extension-member method Extension|fieldAccessFromInstanceContext<T extend
 static extension-member method Extension|get#fieldAccessFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|get#fieldAccessFromInstanceContext::T%> #this) → () → dynamic
   return () → dynamic => self::Extension|fieldAccessFromInstanceContext<self::Extension|get#fieldAccessFromInstanceContext::T%>(#this);
 static extension-member method Extension|getterCallsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|getterCallsFromInstanceContext::T%> #this, self::Extension|getterCallsFromInstanceContext::T% value) → dynamic {
-  self::Extension|tearOffGetterNoArgs{dynamic}.call();
-  self::Extension|tearOffGetterRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterOptional{dynamic}.call();
-  self::Extension|tearOffGetterOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterNamed{dynamic}.call();
-  self::Extension|tearOffGetterNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value: value);
+  self::Extension|tearOffGetterNoArgs{dynamic}();
+  self::Extension|tearOffGetterRequired{dynamic}(value);
+  self::Extension|tearOffGetterOptional{dynamic}();
+  self::Extension|tearOffGetterOptional{dynamic}(value);
+  self::Extension|tearOffGetterNamed{dynamic}();
+  self::Extension|tearOffGetterNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}(value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}();
+  self::Extension|tearOffGetterGenericOptional{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>();
+  self::Extension|tearOffGetterGenericOptional{dynamic}(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}();
+  self::Extension|tearOffGetterGenericNamed{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>();
+  self::Extension|tearOffGetterGenericNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value: value);
 }
 static extension-member method Extension|get#getterCallsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|get#getterCallsFromInstanceContext::T%> #this) → (self::Extension|get#getterCallsFromInstanceContext::T%) → dynamic
   return (self::Extension|get#getterCallsFromInstanceContext::T% value) → dynamic => self::Extension|getterCallsFromInstanceContext<self::Extension|get#getterCallsFromInstanceContext::T%>(#this, value);
diff --git a/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.modular.expect
index 11452ba2b7e..c993bf53cb3 100644
--- a/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.modular.expect
@@ -128,22 +128,22 @@ static extension-member method Extension|fieldAccessFromStaticContext() → dyna
   self::Extension|property = self::Extension|field;
 }
 static extension-member method Extension|getterCallsFromStaticContext(core::int value) → dynamic {
-  self::Extension|tearOffGetterNoArgs{dynamic}.call();
-  self::Extension|tearOffGetterRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterOptional{dynamic}.call();
-  self::Extension|tearOffGetterOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterNamed{dynamic}.call();
-  self::Extension|tearOffGetterNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call<core::int>(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<core::int>();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<core::int>(value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<core::int>();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<core::int>(value: value);
+  self::Extension|tearOffGetterNoArgs{dynamic}();
+  self::Extension|tearOffGetterRequired{dynamic}(value);
+  self::Extension|tearOffGetterOptional{dynamic}();
+  self::Extension|tearOffGetterOptional{dynamic}(value);
+  self::Extension|tearOffGetterNamed{dynamic}();
+  self::Extension|tearOffGetterNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}(value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}<core::int>(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}();
+  self::Extension|tearOffGetterGenericOptional{dynamic}<core::int>();
+  self::Extension|tearOffGetterGenericOptional{dynamic}(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}<core::int>(value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}();
+  self::Extension|tearOffGetterGenericNamed{dynamic}<core::int>();
+  self::Extension|tearOffGetterGenericNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}<core::int>(value: value);
 }
 static extension-member method Extension|invocationsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|invocationsFromInstanceContext::T%> #this, self::Extension|invocationsFromInstanceContext::T% value) → dynamic {
   self::Extension|readGetter();
@@ -199,22 +199,22 @@ static extension-member method Extension|fieldAccessFromInstanceContext<T extend
 static extension-member method Extension|get#fieldAccessFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|get#fieldAccessFromInstanceContext::T%> #this) → () → dynamic
   return () → dynamic => self::Extension|fieldAccessFromInstanceContext<self::Extension|get#fieldAccessFromInstanceContext::T%>(#this);
 static extension-member method Extension|getterCallsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|getterCallsFromInstanceContext::T%> #this, self::Extension|getterCallsFromInstanceContext::T% value) → dynamic {
-  self::Extension|tearOffGetterNoArgs{dynamic}.call();
-  self::Extension|tearOffGetterRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterOptional{dynamic}.call();
-  self::Extension|tearOffGetterOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterNamed{dynamic}.call();
-  self::Extension|tearOffGetterNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value: value);
+  self::Extension|tearOffGetterNoArgs{dynamic}();
+  self::Extension|tearOffGetterRequired{dynamic}(value);
+  self::Extension|tearOffGetterOptional{dynamic}();
+  self::Extension|tearOffGetterOptional{dynamic}(value);
+  self::Extension|tearOffGetterNamed{dynamic}();
+  self::Extension|tearOffGetterNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}(value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}();
+  self::Extension|tearOffGetterGenericOptional{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>();
+  self::Extension|tearOffGetterGenericOptional{dynamic}(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}();
+  self::Extension|tearOffGetterGenericNamed{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>();
+  self::Extension|tearOffGetterGenericNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value: value);
 }
 static extension-member method Extension|get#getterCallsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|get#getterCallsFromInstanceContext::T%> #this) → (self::Extension|get#getterCallsFromInstanceContext::T%) → dynamic
   return (self::Extension|get#getterCallsFromInstanceContext::T% value) → dynamic => self::Extension|getterCallsFromInstanceContext<self::Extension|get#getterCallsFromInstanceContext::T%>(#this, value);
diff --git a/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.transformed.expect
index 11452ba2b7e..c993bf53cb3 100644
--- a/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/direct_static_access.dart.weak.transformed.expect
@@ -128,22 +128,22 @@ static extension-member method Extension|fieldAccessFromStaticContext() → dyna
   self::Extension|property = self::Extension|field;
 }
 static extension-member method Extension|getterCallsFromStaticContext(core::int value) → dynamic {
-  self::Extension|tearOffGetterNoArgs{dynamic}.call();
-  self::Extension|tearOffGetterRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterOptional{dynamic}.call();
-  self::Extension|tearOffGetterOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterNamed{dynamic}.call();
-  self::Extension|tearOffGetterNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call<core::int>(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<core::int>();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<core::int>(value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<core::int>();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<core::int>(value: value);
+  self::Extension|tearOffGetterNoArgs{dynamic}();
+  self::Extension|tearOffGetterRequired{dynamic}(value);
+  self::Extension|tearOffGetterOptional{dynamic}();
+  self::Extension|tearOffGetterOptional{dynamic}(value);
+  self::Extension|tearOffGetterNamed{dynamic}();
+  self::Extension|tearOffGetterNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}(value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}<core::int>(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}();
+  self::Extension|tearOffGetterGenericOptional{dynamic}<core::int>();
+  self::Extension|tearOffGetterGenericOptional{dynamic}(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}<core::int>(value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}();
+  self::Extension|tearOffGetterGenericNamed{dynamic}<core::int>();
+  self::Extension|tearOffGetterGenericNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}<core::int>(value: value);
 }
 static extension-member method Extension|invocationsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|invocationsFromInstanceContext::T%> #this, self::Extension|invocationsFromInstanceContext::T% value) → dynamic {
   self::Extension|readGetter();
@@ -199,22 +199,22 @@ static extension-member method Extension|fieldAccessFromInstanceContext<T extend
 static extension-member method Extension|get#fieldAccessFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|get#fieldAccessFromInstanceContext::T%> #this) → () → dynamic
   return () → dynamic => self::Extension|fieldAccessFromInstanceContext<self::Extension|get#fieldAccessFromInstanceContext::T%>(#this);
 static extension-member method Extension|getterCallsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|getterCallsFromInstanceContext::T%> #this, self::Extension|getterCallsFromInstanceContext::T% value) → dynamic {
-  self::Extension|tearOffGetterNoArgs{dynamic}.call();
-  self::Extension|tearOffGetterRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterOptional{dynamic}.call();
-  self::Extension|tearOffGetterOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterNamed{dynamic}.call();
-  self::Extension|tearOffGetterNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericRequired{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>();
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call(value);
-  self::Extension|tearOffGetterGenericOptional{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>();
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call(value: value);
-  self::Extension|tearOffGetterGenericNamed{dynamic}.call<self::Extension|getterCallsFromInstanceContext::T%>(value: value);
+  self::Extension|tearOffGetterNoArgs{dynamic}();
+  self::Extension|tearOffGetterRequired{dynamic}(value);
+  self::Extension|tearOffGetterOptional{dynamic}();
+  self::Extension|tearOffGetterOptional{dynamic}(value);
+  self::Extension|tearOffGetterNamed{dynamic}();
+  self::Extension|tearOffGetterNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}(value);
+  self::Extension|tearOffGetterGenericRequired{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}();
+  self::Extension|tearOffGetterGenericOptional{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>();
+  self::Extension|tearOffGetterGenericOptional{dynamic}(value);
+  self::Extension|tearOffGetterGenericOptional{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}();
+  self::Extension|tearOffGetterGenericNamed{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>();
+  self::Extension|tearOffGetterGenericNamed{dynamic}(value: value);
+  self::Extension|tearOffGetterGenericNamed{dynamic}<self::Extension|getterCallsFromInstanceContext::T%>(value: value);
 }
 static extension-member method Extension|get#getterCallsFromInstanceContext<T extends core::Object? = dynamic>(lowered final self::Class<self::Extension|get#getterCallsFromInstanceContext::T%> #this) → (self::Extension|get#getterCallsFromInstanceContext::T%) → dynamic
   return (self::Extension|get#getterCallsFromInstanceContext::T% value) → dynamic => self::Extension|getterCallsFromInstanceContext<self::Extension|get#getterCallsFromInstanceContext::T%>(#this, value);
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 7c8b19a85dc..6ef63c4aa3b 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
@@ -108,7 +108,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^" in c{<unresolved>}.m1 = 2;
+    ^^" in c.{<unresolved>}m1 = 2;
   invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:32:5: Error: The property 'm3' is defined in multiple extensions for 'Class' and neither is more specific.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -118,7 +118,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.m3 = 2;
-    ^^" in c{<unresolved>}.m3 = 2;
+    ^^" in c.{<unresolved>}m3 = 2;
   invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:34:5: Error: The property 'm4' is defined in multiple extensions for 'Class' and neither is more specific.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -128,7 +128,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.m4 = 2;
-    ^^" in c{<unresolved>}.m4 = 2;
+    ^^" in c.{<unresolved>}m4 = 2;
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual)) {
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 7c8b19a85dc..6ef63c4aa3b 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
@@ -108,7 +108,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^" in c{<unresolved>}.m1 = 2;
+    ^^" in c.{<unresolved>}m1 = 2;
   invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:32:5: Error: The property 'm3' is defined in multiple extensions for 'Class' and neither is more specific.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -118,7 +118,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.m3 = 2;
-    ^^" in c{<unresolved>}.m3 = 2;
+    ^^" in c.{<unresolved>}m3 = 2;
   invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:34:5: Error: The property 'm4' is defined in multiple extensions for 'Class' and neither is more specific.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -128,7 +128,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.m4 = 2;
-    ^^" in c{<unresolved>}.m4 = 2;
+    ^^" in c.{<unresolved>}m4 = 2;
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual)) {
diff --git a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.expect b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.expect
index 7c8b19a85dc..6ef63c4aa3b 100644
--- a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.expect
@@ -108,7 +108,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^" in c{<unresolved>}.m1 = 2;
+    ^^" in c.{<unresolved>}m1 = 2;
   invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:32:5: Error: The property 'm3' is defined in multiple extensions for 'Class' and neither is more specific.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -118,7 +118,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.m3 = 2;
-    ^^" in c{<unresolved>}.m3 = 2;
+    ^^" in c.{<unresolved>}m3 = 2;
   invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:34:5: Error: The property 'm4' is defined in multiple extensions for 'Class' and neither is more specific.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -128,7 +128,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.m4 = 2;
-    ^^" in c{<unresolved>}.m4 = 2;
+    ^^" in c.{<unresolved>}m4 = 2;
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual)) {
diff --git a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.modular.expect
index 7c8b19a85dc..6ef63c4aa3b 100644
--- a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.modular.expect
@@ -108,7 +108,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^" in c{<unresolved>}.m1 = 2;
+    ^^" in c.{<unresolved>}m1 = 2;
   invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:32:5: Error: The property 'm3' is defined in multiple extensions for 'Class' and neither is more specific.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -118,7 +118,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.m3 = 2;
-    ^^" in c{<unresolved>}.m3 = 2;
+    ^^" in c.{<unresolved>}m3 = 2;
   invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:34:5: Error: The property 'm4' is defined in multiple extensions for 'Class' and neither is more specific.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -128,7 +128,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.m4 = 2;
-    ^^" in c{<unresolved>}.m4 = 2;
+    ^^" in c.{<unresolved>}m4 = 2;
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual)) {
diff --git a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.transformed.expect
index 7c8b19a85dc..6ef63c4aa3b 100644
--- a/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/getter_setter_conflict.dart.weak.transformed.expect
@@ -108,7 +108,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^" in c{<unresolved>}.m1 = 2;
+    ^^" in c.{<unresolved>}m1 = 2;
   invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:32:5: Error: The property 'm3' is defined in multiple extensions for 'Class' and neither is more specific.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -118,7 +118,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.m3 = 2;
-    ^^" in c{<unresolved>}.m3 = 2;
+    ^^" in c.{<unresolved>}m3 = 2;
   invalid-expression "pkg/front_end/testcases/extensions/getter_setter_conflict.dart:34:5: Error: The property 'm4' is defined in multiple extensions for 'Class' and neither is more specific.
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
@@ -128,7 +128,7 @@ Try using an explicit extension application of the wanted extension or hiding un
  - 'Class' is from 'pkg/front_end/testcases/extensions/getter_setter_conflict.dart'.
 Try using an explicit extension application of the wanted extension or hiding unwanted extensions from scope.
   c.m4 = 2;
-    ^^" in c{<unresolved>}.m4 = 2;
+    ^^" in c.{<unresolved>}m4 = 2;
 }
 static method expect(dynamic expected, dynamic actual) → dynamic {
   if(!(expected =={core::Object::==}{(core::Object) → core::bool} actual)) {
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 d006b85c37d..0dbaecc3504 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
@@ -85,7 +85,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^^^" 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'.
  - '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'.
@@ -95,5 +95,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^^^^^^^^^^" in c{<unresolved>}.staticField = 42;
+    ^^^^^^^^^^^" in c.{<unresolved>}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 d006b85c37d..0dbaecc3504 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
@@ -85,7 +85,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^^^" 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'.
  - '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'.
@@ -95,5 +95,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^^^^^^^^^^" in c{<unresolved>}.staticField = 42;
+    ^^^^^^^^^^^" in c.{<unresolved>}staticField = 42;
 }
diff --git a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.expect b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.expect
index d006b85c37d..0dbaecc3504 100644
--- a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.expect
@@ -85,7 +85,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^^^" 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'.
  - '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'.
@@ -95,5 +95,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^^^^^^^^^^" in c{<unresolved>}.staticField = 42;
+    ^^^^^^^^^^^" in c.{<unresolved>}staticField = 42;
 }
diff --git a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.modular.expect
index d006b85c37d..0dbaecc3504 100644
--- a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.modular.expect
@@ -85,7 +85,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^^^" 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'.
  - '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'.
@@ -95,5 +95,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^^^^^^^^^^" in c{<unresolved>}.staticField = 42;
+    ^^^^^^^^^^^" in c.{<unresolved>}staticField = 42;
 }
diff --git a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.transformed.expect
index d006b85c37d..0dbaecc3504 100644
--- a/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/instance_access_of_static.dart.weak.transformed.expect
@@ -85,7 +85,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^^^" 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'.
  - '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'.
@@ -95,5 +95,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^^^^^^^^^^" in c{<unresolved>}.staticField = 42;
+    ^^^^^^^^^^^" in c.{<unresolved>}staticField = 42;
 }
diff --git a/pkg/front_end/testcases/extensions/issue38745.dart.strong.expect b/pkg/front_end/testcases/extensions/issue38745.dart.strong.expect
index 51bd0ee6841..5ce18de8911 100644
--- a/pkg/front_end/testcases/extensions/issue38745.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/issue38745.dart.strong.expect
@@ -149,7 +149,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^" 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>'.
  - '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'.
@@ -165,7 +165,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^^^^^^^^" in c{<unresolved>}.property2 = 23;
+    ^^^^^^^^^" in c.{<unresolved>}property2 = 23;
   invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:40:10: Error: Member not found: 'field'.
   ext(c).field;
          ^^^^^";
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 51bd0ee6841..5ce18de8911 100644
--- a/pkg/front_end/testcases/extensions/issue38745.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue38745.dart.strong.transformed.expect
@@ -149,7 +149,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^" 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>'.
  - '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'.
@@ -165,7 +165,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^^^^^^^^" in c{<unresolved>}.property2 = 23;
+    ^^^^^^^^^" in c.{<unresolved>}property2 = 23;
   invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:40:10: Error: Member not found: 'field'.
   ext(c).field;
          ^^^^^";
diff --git a/pkg/front_end/testcases/extensions/issue38745.dart.weak.expect b/pkg/front_end/testcases/extensions/issue38745.dart.weak.expect
index 51bd0ee6841..5ce18de8911 100644
--- a/pkg/front_end/testcases/extensions/issue38745.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/issue38745.dart.weak.expect
@@ -149,7 +149,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^" 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>'.
  - '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'.
@@ -165,7 +165,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^^^^^^^^" in c{<unresolved>}.property2 = 23;
+    ^^^^^^^^^" in c.{<unresolved>}property2 = 23;
   invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:40:10: Error: Member not found: 'field'.
   ext(c).field;
          ^^^^^";
diff --git a/pkg/front_end/testcases/extensions/issue38745.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/issue38745.dart.weak.modular.expect
index 51bd0ee6841..5ce18de8911 100644
--- a/pkg/front_end/testcases/extensions/issue38745.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/issue38745.dart.weak.modular.expect
@@ -149,7 +149,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^" 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>'.
  - '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'.
@@ -165,7 +165,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^^^^^^^^" in c{<unresolved>}.property2 = 23;
+    ^^^^^^^^^" in c.{<unresolved>}property2 = 23;
   invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:40:10: Error: Member not found: 'field'.
   ext(c).field;
          ^^^^^";
diff --git a/pkg/front_end/testcases/extensions/issue38745.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/issue38745.dart.weak.transformed.expect
index 51bd0ee6841..5ce18de8911 100644
--- a/pkg/front_end/testcases/extensions/issue38745.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue38745.dart.weak.transformed.expect
@@ -149,7 +149,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^" 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>'.
  - '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'.
@@ -165,7 +165,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-    ^^^^^^^^^" in c{<unresolved>}.property2 = 23;
+    ^^^^^^^^^" in c.{<unresolved>}property2 = 23;
   invalid-expression "pkg/front_end/testcases/extensions/issue38745.dart:40:10: Error: Member not found: 'field'.
   ext(c).field;
          ^^^^^";
diff --git a/pkg/front_end/testcases/extensions/issue40713.dart.strong.expect b/pkg/front_end/testcases/extensions/issue40713.dart.strong.expect
index 5f58eace317..3fd20bf7367 100644
--- a/pkg/front_end/testcases/extensions/issue40713.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/issue40713.dart.strong.expect
@@ -26,7 +26,7 @@ static extension-member method SafeAccess|get#safeFirst<T extends core::Object*
 static method main() → dynamic {}
 static method test() → void {
   final core::List<dynamic>* list = <dynamic>[];
-  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}.call();
+  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}();
   final core::List<(core::int*) →* void>* list2 = <(core::int*) →* void>[];
   self::SafeAccess|get#safeFirst<(core::int*) →* void>(list2)(0){(core::int*) →* void};
 }
diff --git a/pkg/front_end/testcases/extensions/issue40713.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/issue40713.dart.strong.transformed.expect
index 4d7a38d60ea..50bfa31d319 100644
--- a/pkg/front_end/testcases/extensions/issue40713.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue40713.dart.strong.transformed.expect
@@ -26,7 +26,7 @@ static extension-member method SafeAccess|get#safeFirst<T extends core::Object*
 static method main() → dynamic {}
 static method test() → void {
   final core::List<dynamic>* list = core::_GrowableList::•<dynamic>(0);
-  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}.call();
+  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}();
   final core::List<(core::int*) →* void>* list2 = core::_GrowableList::•<(core::int*) →* void>(0);
   self::SafeAccess|get#safeFirst<(core::int*) →* void>(list2)(0){(core::int*) →* void};
 }
diff --git a/pkg/front_end/testcases/extensions/issue40713.dart.weak.expect b/pkg/front_end/testcases/extensions/issue40713.dart.weak.expect
index 0dcfebdf22b..9d695c657cd 100644
--- a/pkg/front_end/testcases/extensions/issue40713.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/issue40713.dart.weak.expect
@@ -22,7 +22,7 @@ static extension-member method SafeAccess|get#safeFirst<T extends core::Object*
 static method main() → dynamic {}
 static method test() → void {
   final core::List<dynamic>* list = <dynamic>[];
-  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}.call();
+  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}();
   final core::List<(core::int*) →* void>* list2 = <(core::int*) →* void>[];
   self::SafeAccess|get#safeFirst<(core::int*) →* void>(list2)(0){(core::int*) →* void};
 }
diff --git a/pkg/front_end/testcases/extensions/issue40713.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/issue40713.dart.weak.modular.expect
index 0dcfebdf22b..9d695c657cd 100644
--- a/pkg/front_end/testcases/extensions/issue40713.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/issue40713.dart.weak.modular.expect
@@ -22,7 +22,7 @@ static extension-member method SafeAccess|get#safeFirst<T extends core::Object*
 static method main() → dynamic {}
 static method test() → void {
   final core::List<dynamic>* list = <dynamic>[];
-  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}.call();
+  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}();
   final core::List<(core::int*) →* void>* list2 = <(core::int*) →* void>[];
   self::SafeAccess|get#safeFirst<(core::int*) →* void>(list2)(0){(core::int*) →* void};
 }
diff --git a/pkg/front_end/testcases/extensions/issue40713.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/issue40713.dart.weak.transformed.expect
index f7f020ea92e..df03f0e675a 100644
--- a/pkg/front_end/testcases/extensions/issue40713.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue40713.dart.weak.transformed.expect
@@ -22,7 +22,7 @@ static extension-member method SafeAccess|get#safeFirst<T extends core::Object*
 static method main() → dynamic {}
 static method test() → void {
   final core::List<dynamic>* list = core::_GrowableList::•<dynamic>(0);
-  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}.call();
+  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}();
   final core::List<(core::int*) →* void>* list2 = core::_GrowableList::•<(core::int*) →* void>(0);
   self::SafeAccess|get#safeFirst<(core::int*) →* void>(list2)(0){(core::int*) →* void};
 }
diff --git a/pkg/front_end/testcases/extensions/issue40713_2.dart.strong.expect b/pkg/front_end/testcases/extensions/issue40713_2.dart.strong.expect
index 1a96d67e68c..c99cc0da23f 100644
--- a/pkg/front_end/testcases/extensions/issue40713_2.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/issue40713_2.dart.strong.expect
@@ -22,7 +22,7 @@ static extension-member method SafeAccess|get#safeFirst<T extends core::Object?
 static method main() → dynamic {}
 static method test() → void {
   final core::List<dynamic> list = <dynamic>[];
-  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}.call();
+  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}();
   final core::List<(core::int) → void> list2 = <(core::int) → void>[];
   self::SafeAccess|get#safeFirst<(core::int) → void>(list2)(0){(core::int) → void};
 }
diff --git a/pkg/front_end/testcases/extensions/issue40713_2.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/issue40713_2.dart.strong.transformed.expect
index 1ed1929c309..15dd4f634d0 100644
--- a/pkg/front_end/testcases/extensions/issue40713_2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue40713_2.dart.strong.transformed.expect
@@ -22,7 +22,7 @@ static extension-member method SafeAccess|get#safeFirst<T extends core::Object?
 static method main() → dynamic {}
 static method test() → void {
   final core::List<dynamic> list = core::_GrowableList::•<dynamic>(0);
-  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}.call();
+  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}();
   final core::List<(core::int) → void> list2 = core::_GrowableList::•<(core::int) → void>(0);
   self::SafeAccess|get#safeFirst<(core::int) → void>(list2)(0){(core::int) → void};
 }
diff --git a/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.expect b/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.expect
index 1a96d67e68c..c99cc0da23f 100644
--- a/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.expect
@@ -22,7 +22,7 @@ static extension-member method SafeAccess|get#safeFirst<T extends core::Object?
 static method main() → dynamic {}
 static method test() → void {
   final core::List<dynamic> list = <dynamic>[];
-  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}.call();
+  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}();
   final core::List<(core::int) → void> list2 = <(core::int) → void>[];
   self::SafeAccess|get#safeFirst<(core::int) → void>(list2)(0){(core::int) → void};
 }
diff --git a/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.modular.expect
index 1a96d67e68c..c99cc0da23f 100644
--- a/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.modular.expect
@@ -22,7 +22,7 @@ static extension-member method SafeAccess|get#safeFirst<T extends core::Object?
 static method main() → dynamic {}
 static method test() → void {
   final core::List<dynamic> list = <dynamic>[];
-  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}.call();
+  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}();
   final core::List<(core::int) → void> list2 = <(core::int) → void>[];
   self::SafeAccess|get#safeFirst<(core::int) → void>(list2)(0){(core::int) → void};
 }
diff --git a/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.transformed.expect
index 1ed1929c309..15dd4f634d0 100644
--- a/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue40713_2.dart.weak.transformed.expect
@@ -22,7 +22,7 @@ static extension-member method SafeAccess|get#safeFirst<T extends core::Object?
 static method main() → dynamic {}
 static method test() → void {
   final core::List<dynamic> list = core::_GrowableList::•<dynamic>(0);
-  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}.call();
+  self::SafeAccess|get#safeFirst<dynamic>(list){dynamic}();
   final core::List<(core::int) → void> list2 = core::_GrowableList::•<(core::int) → void>(0);
   self::SafeAccess|get#safeFirst<(core::int) → void>(list2)(0){(core::int) → void};
 }
diff --git a/pkg/front_end/testcases/extensions/issue43218.dart.strong.expect b/pkg/front_end/testcases/extensions/issue43218.dart.strong.expect
index fdccac1a4f8..e446b4fdf5e 100644
--- a/pkg/front_end/testcases/extensions/issue43218.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/issue43218.dart.strong.expect
@@ -33,6 +33,6 @@ static method test() → dynamic {
   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'.
 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};
+         ^^" in #t1.{<unresolved>}id = self::Ext|get#id(#t1).{core::num::+}(1){(core::num) → core::int};
 }
 static method main() → dynamic {}
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 fdccac1a4f8..e446b4fdf5e 100644
--- a/pkg/front_end/testcases/extensions/issue43218.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue43218.dart.strong.transformed.expect
@@ -33,6 +33,6 @@ static method test() → dynamic {
   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'.
 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};
+         ^^" in #t1.{<unresolved>}id = self::Ext|get#id(#t1).{core::num::+}(1){(core::num) → core::int};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/extensions/issue43218.dart.weak.expect b/pkg/front_end/testcases/extensions/issue43218.dart.weak.expect
index fdccac1a4f8..e446b4fdf5e 100644
--- a/pkg/front_end/testcases/extensions/issue43218.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/issue43218.dart.weak.expect
@@ -33,6 +33,6 @@ static method test() → dynamic {
   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'.
 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};
+         ^^" in #t1.{<unresolved>}id = self::Ext|get#id(#t1).{core::num::+}(1){(core::num) → core::int};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/extensions/issue43218.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/issue43218.dart.weak.modular.expect
index fdccac1a4f8..e446b4fdf5e 100644
--- a/pkg/front_end/testcases/extensions/issue43218.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/issue43218.dart.weak.modular.expect
@@ -33,6 +33,6 @@ static method test() → dynamic {
   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'.
 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};
+         ^^" in #t1.{<unresolved>}id = self::Ext|get#id(#t1).{core::num::+}(1){(core::num) → core::int};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/extensions/issue43218.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/issue43218.dart.weak.transformed.expect
index fdccac1a4f8..e446b4fdf5e 100644
--- a/pkg/front_end/testcases/extensions/issue43218.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/issue43218.dart.weak.transformed.expect
@@ -33,6 +33,6 @@ static method test() → dynamic {
   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'.
 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};
+         ^^" in #t1.{<unresolved>}id = self::Ext|get#id(#t1).{core::num::+}(1){(core::num) → core::int};
 }
 static method main() → dynamic {}
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 b5d5fb4ba6d..979a9564dc8 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
@@ -129,7 +129,7 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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;
-            ^^^^^^^^" in nonStruct{<unresolved>}.property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:47: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:47:34: Error: The getter 'property' isn't defined for the class '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;
@@ -148,5 +148,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-                  ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property = null;
+                  ^^^^^^^^" in new self::NonStruct::•().{<unresolved>}property = null;
 }
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 b5d5fb4ba6d..979a9564dc8 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
@@ -129,7 +129,7 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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;
-            ^^^^^^^^" in nonStruct{<unresolved>}.property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:47: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:47:34: Error: The getter 'property' isn't defined for the class '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;
@@ -148,5 +148,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-                  ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property = null;
+                  ^^^^^^^^" in new self::NonStruct::•().{<unresolved>}property = null;
 }
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.expect
index 61d9556d1ba..5af5fdc0ccf 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.expect
@@ -125,7 +125,7 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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;
-            ^^^^^^^^" in nonStruct{<unresolved>}.property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:47: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:47:34: Error: The getter 'property' isn't defined for the class '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;
@@ -144,5 +144,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-                  ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property = null;
+                  ^^^^^^^^" in new self::NonStruct::•().{<unresolved>}property = null;
 }
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.modular.expect
index 61d9556d1ba..5af5fdc0ccf 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.modular.expect
@@ -125,7 +125,7 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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;
-            ^^^^^^^^" in nonStruct{<unresolved>}.property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:47: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:47:34: Error: The getter 'property' isn't defined for the class '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;
@@ -144,5 +144,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-                  ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property = null;
+                  ^^^^^^^^" in new self::NonStruct::•().{<unresolved>}property = null;
 }
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.transformed.expect
index 61d9556d1ba..5af5fdc0ccf 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference.dart.weak.transformed.expect
@@ -125,7 +125,7 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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;
-            ^^^^^^^^" in nonStruct{<unresolved>}.property = invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference.dart:47: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:47:34: Error: The getter 'property' isn't defined for the class '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;
@@ -144,5 +144,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
-                  ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property = null;
+                  ^^^^^^^^" in new self::NonStruct::•().{<unresolved>}property = null;
 }
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.strong.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.strong.expect
index ed841c4c321..3fed6764f13 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.strong.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.strong.expect
@@ -177,7 +177,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   nonStruct.property = nonStruct.property; // error
             ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference2.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_inference2.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_inference2.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference2.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
@@ -198,5 +198,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference2.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
-                  ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property = null;
+                  ^^^^^^^^" in new self::NonStruct::•().{<unresolved>}property = null;
 }
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.strong.transformed.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.strong.transformed.expect
index 65e19bc38ee..6c4a79e1258 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.strong.transformed.expect
@@ -177,7 +177,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   nonStruct.property = nonStruct.property; // error
             ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference2.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_inference2.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_inference2.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference2.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
@@ -198,5 +198,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference2.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
-                  ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property = null;
+                  ^^^^^^^^" in new self::NonStruct::•().{<unresolved>}property = null;
 }
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.expect
index ed841c4c321..3fed6764f13 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.expect
@@ -177,7 +177,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   nonStruct.property = nonStruct.property; // error
             ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference2.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_inference2.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_inference2.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference2.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
@@ -198,5 +198,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference2.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
-                  ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property = null;
+                  ^^^^^^^^" in new self::NonStruct::•().{<unresolved>}property = null;
 }
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.modular.expect
index ed841c4c321..3fed6764f13 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.modular.expect
@@ -177,7 +177,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   nonStruct.property = nonStruct.property; // error
             ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference2.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_inference2.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_inference2.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference2.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
@@ -198,5 +198,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference2.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
-                  ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property = null;
+                  ^^^^^^^^" in new self::NonStruct::•().{<unresolved>}property = null;
 }
diff --git a/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.transformed.expect
index 6700549c128..b6dfe7de961 100644
--- a/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/on_type_variable_inference2.dart.weak.transformed.expect
@@ -177,7 +177,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
   nonStruct.property = nonStruct.property; // error
             ^^^^^^^^" in invalid-expression "pkg/front_end/testcases/extensions/on_type_variable_inference2.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_inference2.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_inference2.dart:60:34: Error: The getter 'property' isn't defined for the class 'NonStruct'.
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference2.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
@@ -198,5 +198,5 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - 'NonStruct' is from 'pkg/front_end/testcases/extensions/on_type_variable_inference2.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
-                  ^^^^^^^^" in new self::NonStruct::•(){<unresolved>}.property = null;
+                  ^^^^^^^^" in new self::NonStruct::•().{<unresolved>}property = null;
 }
diff --git a/pkg/front_end/testcases/general/argument.dart.strong.expect b/pkg/front_end/testcases/general/argument.dart.strong.expect
index ec72aaa418c..68d5e4aafb5 100644
--- a/pkg/front_end/testcases/general/argument.dart.strong.expect
+++ b/pkg/front_end/testcases/general/argument.dart.strong.expect
@@ -27,7 +27,7 @@ static method bar(dynamic x) → void {}
 static method foo_escaped(dynamic x) → void {}
 static method bar_escaped(dynamic x) → void {}
 static method escape(dynamic fn) → void {
-  fn{dynamic}.call(new self::Baz::•());
+  fn{dynamic}(new self::Baz::•());
 }
 static method main() → dynamic {
   self::foo(new self::Foo::•());
diff --git a/pkg/front_end/testcases/general/argument.dart.strong.transformed.expect b/pkg/front_end/testcases/general/argument.dart.strong.transformed.expect
index ec72aaa418c..68d5e4aafb5 100644
--- a/pkg/front_end/testcases/general/argument.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/argument.dart.strong.transformed.expect
@@ -27,7 +27,7 @@ static method bar(dynamic x) → void {}
 static method foo_escaped(dynamic x) → void {}
 static method bar_escaped(dynamic x) → void {}
 static method escape(dynamic fn) → void {
-  fn{dynamic}.call(new self::Baz::•());
+  fn{dynamic}(new self::Baz::•());
 }
 static method main() → dynamic {
   self::foo(new self::Foo::•());
diff --git a/pkg/front_end/testcases/general/argument.dart.weak.expect b/pkg/front_end/testcases/general/argument.dart.weak.expect
index ec72aaa418c..68d5e4aafb5 100644
--- a/pkg/front_end/testcases/general/argument.dart.weak.expect
+++ b/pkg/front_end/testcases/general/argument.dart.weak.expect
@@ -27,7 +27,7 @@ static method bar(dynamic x) → void {}
 static method foo_escaped(dynamic x) → void {}
 static method bar_escaped(dynamic x) → void {}
 static method escape(dynamic fn) → void {
-  fn{dynamic}.call(new self::Baz::•());
+  fn{dynamic}(new self::Baz::•());
 }
 static method main() → dynamic {
   self::foo(new self::Foo::•());
diff --git a/pkg/front_end/testcases/general/argument.dart.weak.modular.expect b/pkg/front_end/testcases/general/argument.dart.weak.modular.expect
index ec72aaa418c..68d5e4aafb5 100644
--- a/pkg/front_end/testcases/general/argument.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/argument.dart.weak.modular.expect
@@ -27,7 +27,7 @@ static method bar(dynamic x) → void {}
 static method foo_escaped(dynamic x) → void {}
 static method bar_escaped(dynamic x) → void {}
 static method escape(dynamic fn) → void {
-  fn{dynamic}.call(new self::Baz::•());
+  fn{dynamic}(new self::Baz::•());
 }
 static method main() → dynamic {
   self::foo(new self::Foo::•());
diff --git a/pkg/front_end/testcases/general/argument.dart.weak.transformed.expect b/pkg/front_end/testcases/general/argument.dart.weak.transformed.expect
index ec72aaa418c..68d5e4aafb5 100644
--- a/pkg/front_end/testcases/general/argument.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/argument.dart.weak.transformed.expect
@@ -27,7 +27,7 @@ static method bar(dynamic x) → void {}
 static method foo_escaped(dynamic x) → void {}
 static method bar_escaped(dynamic x) → void {}
 static method escape(dynamic fn) → void {
-  fn{dynamic}.call(new self::Baz::•());
+  fn{dynamic}(new self::Baz::•());
 }
 static method main() → dynamic {
   self::foo(new self::Foo::•());
diff --git a/pkg/front_end/testcases/general/bad_store.dart.strong.expect b/pkg/front_end/testcases/general/bad_store.dart.strong.expect
index 2fb5fae8417..3a48e641aa2 100644
--- a/pkg/front_end/testcases/general/bad_store.dart.strong.expect
+++ b/pkg/front_end/testcases/general/bad_store.dart.strong.expect
@@ -14,10 +14,10 @@ static method use(dynamic x) → void {}
 static method main(core::List<core::String> args) → dynamic {
   dynamic foo = self::identity(new self::Foo::•());
   if(args.{core::List::length}{core::int}.{core::num::>}(1){(core::num) → core::bool}) {
-    foo{dynamic}.field = "string";
+    foo.{dynamic}field = "string";
     dynamic first = foo{dynamic}.field;
     self::use(first);
-    foo{dynamic}.noField = "string";
+    foo.{dynamic}noField = "string";
     dynamic second = foo{dynamic}.noField;
     self::use(second);
   }
diff --git a/pkg/front_end/testcases/general/bad_store.dart.strong.transformed.expect b/pkg/front_end/testcases/general/bad_store.dart.strong.transformed.expect
index 2fb5fae8417..3a48e641aa2 100644
--- a/pkg/front_end/testcases/general/bad_store.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/bad_store.dart.strong.transformed.expect
@@ -14,10 +14,10 @@ static method use(dynamic x) → void {}
 static method main(core::List<core::String> args) → dynamic {
   dynamic foo = self::identity(new self::Foo::•());
   if(args.{core::List::length}{core::int}.{core::num::>}(1){(core::num) → core::bool}) {
-    foo{dynamic}.field = "string";
+    foo.{dynamic}field = "string";
     dynamic first = foo{dynamic}.field;
     self::use(first);
-    foo{dynamic}.noField = "string";
+    foo.{dynamic}noField = "string";
     dynamic second = foo{dynamic}.noField;
     self::use(second);
   }
diff --git a/pkg/front_end/testcases/general/bad_store.dart.weak.expect b/pkg/front_end/testcases/general/bad_store.dart.weak.expect
index 2fb5fae8417..3a48e641aa2 100644
--- a/pkg/front_end/testcases/general/bad_store.dart.weak.expect
+++ b/pkg/front_end/testcases/general/bad_store.dart.weak.expect
@@ -14,10 +14,10 @@ static method use(dynamic x) → void {}
 static method main(core::List<core::String> args) → dynamic {
   dynamic foo = self::identity(new self::Foo::•());
   if(args.{core::List::length}{core::int}.{core::num::>}(1){(core::num) → core::bool}) {
-    foo{dynamic}.field = "string";
+    foo.{dynamic}field = "string";
     dynamic first = foo{dynamic}.field;
     self::use(first);
-    foo{dynamic}.noField = "string";
+    foo.{dynamic}noField = "string";
     dynamic second = foo{dynamic}.noField;
     self::use(second);
   }
diff --git a/pkg/front_end/testcases/general/bad_store.dart.weak.modular.expect b/pkg/front_end/testcases/general/bad_store.dart.weak.modular.expect
index 2fb5fae8417..3a48e641aa2 100644
--- a/pkg/front_end/testcases/general/bad_store.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/bad_store.dart.weak.modular.expect
@@ -14,10 +14,10 @@ static method use(dynamic x) → void {}
 static method main(core::List<core::String> args) → dynamic {
   dynamic foo = self::identity(new self::Foo::•());
   if(args.{core::List::length}{core::int}.{core::num::>}(1){(core::num) → core::bool}) {
-    foo{dynamic}.field = "string";
+    foo.{dynamic}field = "string";
     dynamic first = foo{dynamic}.field;
     self::use(first);
-    foo{dynamic}.noField = "string";
+    foo.{dynamic}noField = "string";
     dynamic second = foo{dynamic}.noField;
     self::use(second);
   }
diff --git a/pkg/front_end/testcases/general/bad_store.dart.weak.transformed.expect b/pkg/front_end/testcases/general/bad_store.dart.weak.transformed.expect
index 2fb5fae8417..3a48e641aa2 100644
--- a/pkg/front_end/testcases/general/bad_store.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/bad_store.dart.weak.transformed.expect
@@ -14,10 +14,10 @@ static method use(dynamic x) → void {}
 static method main(core::List<core::String> args) → dynamic {
   dynamic foo = self::identity(new self::Foo::•());
   if(args.{core::List::length}{core::int}.{core::num::>}(1){(core::num) → core::bool}) {
-    foo{dynamic}.field = "string";
+    foo.{dynamic}field = "string";
     dynamic first = foo{dynamic}.field;
     self::use(first);
-    foo{dynamic}.noField = "string";
+    foo.{dynamic}noField = "string";
     dynamic second = foo{dynamic}.noField;
     self::use(second);
   }
diff --git a/pkg/front_end/testcases/general/bounds_type_arguments.dart.strong.expect b/pkg/front_end/testcases/general/bounds_type_arguments.dart.strong.expect
index 81d01da2fd3..5d172431021 100644
--- a/pkg/front_end/testcases/general/bounds_type_arguments.dart.strong.expect
+++ b/pkg/front_end/testcases/general/bounds_type_arguments.dart.strong.expect
@@ -390,7 +390,7 @@ static method test() → dynamic {
   new self::Class1::•<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
   new self::Class2::•().{self::Class2::instanceMethod}<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>(){() → void};
   dynamic d = #C1;
-  d{dynamic}.call<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
+  d{dynamic}<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
   new self::Class2::•();
   new self::Class2::•();
   new self::Class2::•();
diff --git a/pkg/front_end/testcases/general/bounds_type_arguments.dart.strong.transformed.expect b/pkg/front_end/testcases/general/bounds_type_arguments.dart.strong.transformed.expect
index 81d01da2fd3..5d172431021 100644
--- a/pkg/front_end/testcases/general/bounds_type_arguments.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/bounds_type_arguments.dart.strong.transformed.expect
@@ -390,7 +390,7 @@ static method test() → dynamic {
   new self::Class1::•<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
   new self::Class2::•().{self::Class2::instanceMethod}<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>(){() → void};
   dynamic d = #C1;
-  d{dynamic}.call<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
+  d{dynamic}<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
   new self::Class2::•();
   new self::Class2::•();
   new self::Class2::•();
diff --git a/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.expect b/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.expect
index 81d01da2fd3..5d172431021 100644
--- a/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.expect
+++ b/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.expect
@@ -390,7 +390,7 @@ static method test() → dynamic {
   new self::Class1::•<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
   new self::Class2::•().{self::Class2::instanceMethod}<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>(){() → void};
   dynamic d = #C1;
-  d{dynamic}.call<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
+  d{dynamic}<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
   new self::Class2::•();
   new self::Class2::•();
   new self::Class2::•();
diff --git a/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.modular.expect b/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.modular.expect
index 81d01da2fd3..5d172431021 100644
--- a/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.modular.expect
@@ -390,7 +390,7 @@ static method test() → dynamic {
   new self::Class1::•<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
   new self::Class2::•().{self::Class2::instanceMethod}<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>(){() → void};
   dynamic d = #C1;
-  d{dynamic}.call<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
+  d{dynamic}<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
   new self::Class2::•();
   new self::Class2::•();
   new self::Class2::•();
diff --git a/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.transformed.expect b/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.transformed.expect
index 81d01da2fd3..5d172431021 100644
--- a/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/bounds_type_arguments.dart.weak.transformed.expect
@@ -390,7 +390,7 @@ static method test() → dynamic {
   new self::Class1::•<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
   new self::Class2::•().{self::Class2::instanceMethod}<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>(){() → void};
   dynamic d = #C1;
-  d{dynamic}.call<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
+  d{dynamic}<self::Class<dynamic>, dynamic, self::Class<dynamic>, self::Class<dynamic>, self::ConcreteClass, self::Class<self::ConcreteClass>, core::Object, core::int, self::G<self::Class<dynamic>>, self::G<dynamic>, self::G<self::Class<dynamic>>, self::G<self::Class<dynamic>>, self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>, self::G<core::Object>, self::G<core::int>>();
   new self::Class2::•();
   new self::Class2::•();
   new self::Class2::•();
diff --git a/pkg/front_end/testcases/general/call.dart.strong.expect b/pkg/front_end/testcases/general/call.dart.strong.expect
index a5f5c025069..dd0d9844137 100644
--- a/pkg/front_end/testcases/general/call.dart.strong.expect
+++ b/pkg/front_end/testcases/general/call.dart.strong.expect
@@ -124,7 +124,7 @@ static field invalid-type string5 = invalid-expression "pkg/front_end/testcases/
 Try changing 'call' to a method or explicitly invoke 'call'.
 var string5 = callableGetter(1);
                             ^";
-static field dynamic string6 = let final self::CallableGetter #t1 = self::callableGetter in let final core::int #t2 = 1 in #t1.{self::CallableGetter::call}{dynamic}{dynamic}.call(#t2);
+static field dynamic string6 = let final self::CallableGetter #t1 = self::callableGetter in let final core::int #t2 = 1 in #t1.{self::CallableGetter::call}{dynamic}{dynamic}(#t2);
 static field dynamic string7 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call(1);
 static field dynamic string8 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call(1);
 static field invalid-type nothing1 = invalid-expression "pkg/front_end/testcases/general/call.dart:68:23: Error: Too few positional arguments: 1 required, 0 given.
@@ -156,7 +156,7 @@ static field invalid-type nothing9 = invalid-expression "pkg/front_end/testcases
 Try changing 'call' to a method or explicitly invoke 'call'.
 var nothing9 = callableGetter();
                              ^";
-static field dynamic nothing10 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
+static field dynamic nothing10 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}();
 static field dynamic nothing11 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
 static field dynamic nothing12 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call();
 static method main() → dynamic {
@@ -176,7 +176,7 @@ static method main() → dynamic {
 Try changing 'call' to a method or explicitly invoke 'call'.
   var string5 = callableGetter(1);
                               ^";
-  dynamic string6 = let final self::CallableGetter #t3 = callableGetter in let final core::int #t4 = 1 in #t3.{self::CallableGetter::call}{dynamic}{dynamic}.call(#t4);
+  dynamic string6 = let final self::CallableGetter #t3 = callableGetter in let final core::int #t4 = 1 in #t3.{self::CallableGetter::call}{dynamic}{dynamic}(#t4);
   dynamic string7 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call(1);
   dynamic string8 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call(1);
   invalid-type nothing1 = invalid-expression "pkg/front_end/testcases/general/call.dart:34:25: Error: Too few positional arguments: 1 required, 0 given.
@@ -208,7 +208,7 @@ Try changing 'call' to a method or explicitly invoke 'call'.
 Try changing 'call' to a method or explicitly invoke 'call'.
   var nothing9 = callableGetter();
                                ^";
-  dynamic nothing10 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
+  dynamic nothing10 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}();
   dynamic nothing11 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
   dynamic nothing12 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call();
 }
diff --git a/pkg/front_end/testcases/general/call.dart.strong.transformed.expect b/pkg/front_end/testcases/general/call.dart.strong.transformed.expect
index 9804a19c74e..74b9992679d 100644
--- a/pkg/front_end/testcases/general/call.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/call.dart.strong.transformed.expect
@@ -124,7 +124,7 @@ static field invalid-type string5 = invalid-expression "pkg/front_end/testcases/
 Try changing 'call' to a method or explicitly invoke 'call'.
 var string5 = callableGetter(1);
                             ^";
-static field dynamic string6 = let final self::CallableGetter #t1 = self::callableGetter in let final core::int #t2 = 1 in #t1.{self::CallableGetter::call}{dynamic}{dynamic}.call(#t2);
+static field dynamic string6 = let final self::CallableGetter #t1 = self::callableGetter in let final core::int #t2 = 1 in #t1.{self::CallableGetter::call}{dynamic}{dynamic}(#t2);
 static field dynamic string7 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call(1);
 static field dynamic string8 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call(1);
 static field invalid-type nothing1 = invalid-expression "pkg/front_end/testcases/general/call.dart:68:23: Error: Too few positional arguments: 1 required, 0 given.
@@ -156,7 +156,7 @@ static field invalid-type nothing9 = invalid-expression "pkg/front_end/testcases
 Try changing 'call' to a method or explicitly invoke 'call'.
 var nothing9 = callableGetter();
                              ^";
-static field dynamic nothing10 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
+static field dynamic nothing10 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}();
 static field dynamic nothing11 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
 static field dynamic nothing12 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call();
 static method main() → dynamic {
@@ -176,7 +176,7 @@ static method main() → dynamic {
 Try changing 'call' to a method or explicitly invoke 'call'.
   var string5 = callableGetter(1);
                               ^";
-  dynamic string6 = let final self::CallableGetter #t3 = callableGetter in let final core::int #t4 = 1 in #t3.{self::CallableGetter::call}{dynamic}{dynamic}.call(#t4);
+  dynamic string6 = let final self::CallableGetter #t3 = callableGetter in let final core::int #t4 = 1 in #t3.{self::CallableGetter::call}{dynamic}{dynamic}(#t4);
   dynamic string7 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call(1);
   dynamic string8 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call(1);
   invalid-type nothing1 = invalid-expression "pkg/front_end/testcases/general/call.dart:34:25: Error: Too few positional arguments: 1 required, 0 given.
@@ -208,7 +208,7 @@ Try changing 'call' to a method or explicitly invoke 'call'.
 Try changing 'call' to a method or explicitly invoke 'call'.
   var nothing9 = callableGetter();
                                ^";
-  dynamic nothing10 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
+  dynamic nothing10 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}();
   dynamic nothing11 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
   dynamic nothing12 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call();
 }
diff --git a/pkg/front_end/testcases/general/call.dart.weak.expect b/pkg/front_end/testcases/general/call.dart.weak.expect
index a5f5c025069..dd0d9844137 100644
--- a/pkg/front_end/testcases/general/call.dart.weak.expect
+++ b/pkg/front_end/testcases/general/call.dart.weak.expect
@@ -124,7 +124,7 @@ static field invalid-type string5 = invalid-expression "pkg/front_end/testcases/
 Try changing 'call' to a method or explicitly invoke 'call'.
 var string5 = callableGetter(1);
                             ^";
-static field dynamic string6 = let final self::CallableGetter #t1 = self::callableGetter in let final core::int #t2 = 1 in #t1.{self::CallableGetter::call}{dynamic}{dynamic}.call(#t2);
+static field dynamic string6 = let final self::CallableGetter #t1 = self::callableGetter in let final core::int #t2 = 1 in #t1.{self::CallableGetter::call}{dynamic}{dynamic}(#t2);
 static field dynamic string7 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call(1);
 static field dynamic string8 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call(1);
 static field invalid-type nothing1 = invalid-expression "pkg/front_end/testcases/general/call.dart:68:23: Error: Too few positional arguments: 1 required, 0 given.
@@ -156,7 +156,7 @@ static field invalid-type nothing9 = invalid-expression "pkg/front_end/testcases
 Try changing 'call' to a method or explicitly invoke 'call'.
 var nothing9 = callableGetter();
                              ^";
-static field dynamic nothing10 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
+static field dynamic nothing10 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}();
 static field dynamic nothing11 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
 static field dynamic nothing12 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call();
 static method main() → dynamic {
@@ -176,7 +176,7 @@ static method main() → dynamic {
 Try changing 'call' to a method or explicitly invoke 'call'.
   var string5 = callableGetter(1);
                               ^";
-  dynamic string6 = let final self::CallableGetter #t3 = callableGetter in let final core::int #t4 = 1 in #t3.{self::CallableGetter::call}{dynamic}{dynamic}.call(#t4);
+  dynamic string6 = let final self::CallableGetter #t3 = callableGetter in let final core::int #t4 = 1 in #t3.{self::CallableGetter::call}{dynamic}{dynamic}(#t4);
   dynamic string7 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call(1);
   dynamic string8 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call(1);
   invalid-type nothing1 = invalid-expression "pkg/front_end/testcases/general/call.dart:34:25: Error: Too few positional arguments: 1 required, 0 given.
@@ -208,7 +208,7 @@ Try changing 'call' to a method or explicitly invoke 'call'.
 Try changing 'call' to a method or explicitly invoke 'call'.
   var nothing9 = callableGetter();
                                ^";
-  dynamic nothing10 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
+  dynamic nothing10 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}();
   dynamic nothing11 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
   dynamic nothing12 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call();
 }
diff --git a/pkg/front_end/testcases/general/call.dart.weak.modular.expect b/pkg/front_end/testcases/general/call.dart.weak.modular.expect
index a5f5c025069..dd0d9844137 100644
--- a/pkg/front_end/testcases/general/call.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/call.dart.weak.modular.expect
@@ -124,7 +124,7 @@ static field invalid-type string5 = invalid-expression "pkg/front_end/testcases/
 Try changing 'call' to a method or explicitly invoke 'call'.
 var string5 = callableGetter(1);
                             ^";
-static field dynamic string6 = let final self::CallableGetter #t1 = self::callableGetter in let final core::int #t2 = 1 in #t1.{self::CallableGetter::call}{dynamic}{dynamic}.call(#t2);
+static field dynamic string6 = let final self::CallableGetter #t1 = self::callableGetter in let final core::int #t2 = 1 in #t1.{self::CallableGetter::call}{dynamic}{dynamic}(#t2);
 static field dynamic string7 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call(1);
 static field dynamic string8 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call(1);
 static field invalid-type nothing1 = invalid-expression "pkg/front_end/testcases/general/call.dart:68:23: Error: Too few positional arguments: 1 required, 0 given.
@@ -156,7 +156,7 @@ static field invalid-type nothing9 = invalid-expression "pkg/front_end/testcases
 Try changing 'call' to a method or explicitly invoke 'call'.
 var nothing9 = callableGetter();
                              ^";
-static field dynamic nothing10 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
+static field dynamic nothing10 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}();
 static field dynamic nothing11 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
 static field dynamic nothing12 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call();
 static method main() → dynamic {
@@ -176,7 +176,7 @@ static method main() → dynamic {
 Try changing 'call' to a method or explicitly invoke 'call'.
   var string5 = callableGetter(1);
                               ^";
-  dynamic string6 = let final self::CallableGetter #t3 = callableGetter in let final core::int #t4 = 1 in #t3.{self::CallableGetter::call}{dynamic}{dynamic}.call(#t4);
+  dynamic string6 = let final self::CallableGetter #t3 = callableGetter in let final core::int #t4 = 1 in #t3.{self::CallableGetter::call}{dynamic}{dynamic}(#t4);
   dynamic string7 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call(1);
   dynamic string8 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call(1);
   invalid-type nothing1 = invalid-expression "pkg/front_end/testcases/general/call.dart:34:25: Error: Too few positional arguments: 1 required, 0 given.
@@ -208,7 +208,7 @@ Try changing 'call' to a method or explicitly invoke 'call'.
 Try changing 'call' to a method or explicitly invoke 'call'.
   var nothing9 = callableGetter();
                                ^";
-  dynamic nothing10 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
+  dynamic nothing10 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}();
   dynamic nothing11 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
   dynamic nothing12 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call();
 }
diff --git a/pkg/front_end/testcases/general/call.dart.weak.transformed.expect b/pkg/front_end/testcases/general/call.dart.weak.transformed.expect
index 9804a19c74e..74b9992679d 100644
--- a/pkg/front_end/testcases/general/call.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/call.dart.weak.transformed.expect
@@ -124,7 +124,7 @@ static field invalid-type string5 = invalid-expression "pkg/front_end/testcases/
 Try changing 'call' to a method or explicitly invoke 'call'.
 var string5 = callableGetter(1);
                             ^";
-static field dynamic string6 = let final self::CallableGetter #t1 = self::callableGetter in let final core::int #t2 = 1 in #t1.{self::CallableGetter::call}{dynamic}{dynamic}.call(#t2);
+static field dynamic string6 = let final self::CallableGetter #t1 = self::callableGetter in let final core::int #t2 = 1 in #t1.{self::CallableGetter::call}{dynamic}{dynamic}(#t2);
 static field dynamic string7 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call(1);
 static field dynamic string8 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call(1);
 static field invalid-type nothing1 = invalid-expression "pkg/front_end/testcases/general/call.dart:68:23: Error: Too few positional arguments: 1 required, 0 given.
@@ -156,7 +156,7 @@ static field invalid-type nothing9 = invalid-expression "pkg/front_end/testcases
 Try changing 'call' to a method or explicitly invoke 'call'.
 var nothing9 = callableGetter();
                              ^";
-static field dynamic nothing10 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
+static field dynamic nothing10 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}();
 static field dynamic nothing11 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
 static field dynamic nothing12 = self::callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call();
 static method main() → dynamic {
@@ -176,7 +176,7 @@ static method main() → dynamic {
 Try changing 'call' to a method or explicitly invoke 'call'.
   var string5 = callableGetter(1);
                               ^";
-  dynamic string6 = let final self::CallableGetter #t3 = callableGetter in let final core::int #t4 = 1 in #t3.{self::CallableGetter::call}{dynamic}{dynamic}.call(#t4);
+  dynamic string6 = let final self::CallableGetter #t3 = callableGetter in let final core::int #t4 = 1 in #t3.{self::CallableGetter::call}{dynamic}{dynamic}(#t4);
   dynamic string7 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call(1);
   dynamic string8 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call(1);
   invalid-type nothing1 = invalid-expression "pkg/front_end/testcases/general/call.dart:34:25: Error: Too few positional arguments: 1 required, 0 given.
@@ -208,7 +208,7 @@ Try changing 'call' to a method or explicitly invoke 'call'.
 Try changing 'call' to a method or explicitly invoke 'call'.
   var nothing9 = callableGetter();
                                ^";
-  dynamic nothing10 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
+  dynamic nothing10 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}();
   dynamic nothing11 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call();
   dynamic nothing12 = callableGetter.{self::CallableGetter::call}{dynamic}{dynamic}.call{dynamic}.call();
 }
diff --git a/pkg/front_end/testcases/general/closure.dart.strong.expect b/pkg/front_end/testcases/general/closure.dart.strong.expect
index c5c05d24e2d..54c40dfb195 100644
--- a/pkg/front_end/testcases/general/closure.dart.strong.expect
+++ b/pkg/front_end/testcases/general/closure.dart.strong.expect
@@ -14,7 +14,7 @@ class Bar extends core::Object {
     ;
 }
 static method useCallback(dynamic callback) → dynamic {
-  dynamic _ = callback{dynamic}.call();
+  dynamic _ = callback{dynamic}();
 }
 static method main() → dynamic {
   dynamic x;
diff --git a/pkg/front_end/testcases/general/closure.dart.strong.transformed.expect b/pkg/front_end/testcases/general/closure.dart.strong.transformed.expect
index c5c05d24e2d..54c40dfb195 100644
--- a/pkg/front_end/testcases/general/closure.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/closure.dart.strong.transformed.expect
@@ -14,7 +14,7 @@ class Bar extends core::Object {
     ;
 }
 static method useCallback(dynamic callback) → dynamic {
-  dynamic _ = callback{dynamic}.call();
+  dynamic _ = callback{dynamic}();
 }
 static method main() → dynamic {
   dynamic x;
diff --git a/pkg/front_end/testcases/general/closure.dart.weak.expect b/pkg/front_end/testcases/general/closure.dart.weak.expect
index c5c05d24e2d..54c40dfb195 100644
--- a/pkg/front_end/testcases/general/closure.dart.weak.expect
+++ b/pkg/front_end/testcases/general/closure.dart.weak.expect
@@ -14,7 +14,7 @@ class Bar extends core::Object {
     ;
 }
 static method useCallback(dynamic callback) → dynamic {
-  dynamic _ = callback{dynamic}.call();
+  dynamic _ = callback{dynamic}();
 }
 static method main() → dynamic {
   dynamic x;
diff --git a/pkg/front_end/testcases/general/closure.dart.weak.modular.expect b/pkg/front_end/testcases/general/closure.dart.weak.modular.expect
index c5c05d24e2d..54c40dfb195 100644
--- a/pkg/front_end/testcases/general/closure.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/closure.dart.weak.modular.expect
@@ -14,7 +14,7 @@ class Bar extends core::Object {
     ;
 }
 static method useCallback(dynamic callback) → dynamic {
-  dynamic _ = callback{dynamic}.call();
+  dynamic _ = callback{dynamic}();
 }
 static method main() → dynamic {
   dynamic x;
diff --git a/pkg/front_end/testcases/general/closure.dart.weak.transformed.expect b/pkg/front_end/testcases/general/closure.dart.weak.transformed.expect
index c5c05d24e2d..54c40dfb195 100644
--- a/pkg/front_end/testcases/general/closure.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/closure.dart.weak.transformed.expect
@@ -14,7 +14,7 @@ class Bar extends core::Object {
     ;
 }
 static method useCallback(dynamic callback) → dynamic {
-  dynamic _ = callback{dynamic}.call();
+  dynamic _ = callback{dynamic}();
 }
 static method main() → dynamic {
   dynamic x;
diff --git a/pkg/front_end/testcases/general/duplicated_declarations.dart.strong.expect b/pkg/front_end/testcases/general/duplicated_declarations.dart.strong.expect
index 1f95bba7592..fdfbc195446 100644
--- a/pkg/front_end/testcases/general/duplicated_declarations.dart.strong.expect
+++ b/pkg/front_end/testcases/general/duplicated_declarations.dart.strong.expect
@@ -495,7 +495,7 @@ static method main() → dynamic {
 static method foo() → dynamic {
   invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:36:3: Error: Can't use 'main' because it is declared more than once.
   main();
-  ^"{dynamic}.call();
+  ^"{dynamic}();
   core::print(invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:37:9: Error: Can't use 'field' because it is declared more than once.
   print(field);
         ^");
diff --git a/pkg/front_end/testcases/general/duplicated_declarations.dart.strong.transformed.expect b/pkg/front_end/testcases/general/duplicated_declarations.dart.strong.transformed.expect
index 1f95bba7592..fdfbc195446 100644
--- a/pkg/front_end/testcases/general/duplicated_declarations.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/duplicated_declarations.dart.strong.transformed.expect
@@ -495,7 +495,7 @@ static method main() → dynamic {
 static method foo() → dynamic {
   invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:36:3: Error: Can't use 'main' because it is declared more than once.
   main();
-  ^"{dynamic}.call();
+  ^"{dynamic}();
   core::print(invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:37:9: Error: Can't use 'field' because it is declared more than once.
   print(field);
         ^");
diff --git a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.expect b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.expect
index df022c83def..e13777c351b 100644
--- a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.expect
+++ b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.expect
@@ -495,7 +495,7 @@ static method main() → dynamic {
 static method foo() → dynamic {
   invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:36:3: Error: Can't use 'main' because it is declared more than once.
   main();
-  ^"{dynamic}.call();
+  ^"{dynamic}();
   core::print(invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:37:9: Error: Can't use 'field' because it is declared more than once.
   print(field);
         ^");
diff --git a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.modular.expect b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.modular.expect
index df022c83def..e13777c351b 100644
--- a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.modular.expect
@@ -495,7 +495,7 @@ static method main() → dynamic {
 static method foo() → dynamic {
   invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:36:3: Error: Can't use 'main' because it is declared more than once.
   main();
-  ^"{dynamic}.call();
+  ^"{dynamic}();
   core::print(invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:37:9: Error: Can't use 'field' because it is declared more than once.
   print(field);
         ^");
diff --git a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.transformed.expect b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.transformed.expect
index df022c83def..e13777c351b 100644
--- a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.transformed.expect
@@ -495,7 +495,7 @@ static method main() → dynamic {
 static method foo() → dynamic {
   invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:36:3: Error: Can't use 'main' because it is declared more than once.
   main();
-  ^"{dynamic}.call();
+  ^"{dynamic}();
   core::print(invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:37:9: Error: Can't use 'field' because it is declared more than once.
   print(field);
         ^");
diff --git a/pkg/front_end/testcases/general/dynamic_call.dart b/pkg/front_end/testcases/general/dynamic_call.dart
new file mode 100644
index 00000000000..fee7d0185c7
--- /dev/null
+++ b/pkg/front_end/testcases/general/dynamic_call.dart
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, 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(dynamic d) {
+  d();
+  d.call();
+}
diff --git a/pkg/front_end/testcases/general/dynamic_call.dart.strong.expect b/pkg/front_end/testcases/general/dynamic_call.dart.strong.expect
new file mode 100644
index 00000000000..d5958ec2ea3
--- /dev/null
+++ b/pkg/front_end/testcases/general/dynamic_call.dart.strong.expect
@@ -0,0 +1,7 @@
+library;
+import self as self;
+
+static method method(dynamic d) → dynamic {
+  d{dynamic}();
+  d{dynamic}.call();
+}
diff --git a/pkg/front_end/testcases/general/dynamic_call.dart.strong.transformed.expect b/pkg/front_end/testcases/general/dynamic_call.dart.strong.transformed.expect
new file mode 100644
index 00000000000..d5958ec2ea3
--- /dev/null
+++ b/pkg/front_end/testcases/general/dynamic_call.dart.strong.transformed.expect
@@ -0,0 +1,7 @@
+library;
+import self as self;
+
+static method method(dynamic d) → dynamic {
+  d{dynamic}();
+  d{dynamic}.call();
+}
diff --git a/pkg/front_end/testcases/general/dynamic_call.dart.textual_outline.expect b/pkg/front_end/testcases/general/dynamic_call.dart.textual_outline.expect
new file mode 100644
index 00000000000..a8f972d66f4
--- /dev/null
+++ b/pkg/front_end/testcases/general/dynamic_call.dart.textual_outline.expect
@@ -0,0 +1 @@
+method(dynamic d) {}
diff --git a/pkg/front_end/testcases/general/dynamic_call.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general/dynamic_call.dart.textual_outline_modelled.expect
new file mode 100644
index 00000000000..a8f972d66f4
--- /dev/null
+++ b/pkg/front_end/testcases/general/dynamic_call.dart.textual_outline_modelled.expect
@@ -0,0 +1 @@
+method(dynamic d) {}
diff --git a/pkg/front_end/testcases/general/dynamic_call.dart.weak.expect b/pkg/front_end/testcases/general/dynamic_call.dart.weak.expect
new file mode 100644
index 00000000000..d5958ec2ea3
--- /dev/null
+++ b/pkg/front_end/testcases/general/dynamic_call.dart.weak.expect
@@ -0,0 +1,7 @@
+library;
+import self as self;
+
+static method method(dynamic d) → dynamic {
+  d{dynamic}();
+  d{dynamic}.call();
+}
diff --git a/pkg/front_end/testcases/general/dynamic_call.dart.weak.modular.expect b/pkg/front_end/testcases/general/dynamic_call.dart.weak.modular.expect
new file mode 100644
index 00000000000..d5958ec2ea3
--- /dev/null
+++ b/pkg/front_end/testcases/general/dynamic_call.dart.weak.modular.expect
@@ -0,0 +1,7 @@
+library;
+import self as self;
+
+static method method(dynamic d) → dynamic {
+  d{dynamic}();
+  d{dynamic}.call();
+}
diff --git a/pkg/front_end/testcases/general/dynamic_call.dart.weak.outline.expect b/pkg/front_end/testcases/general/dynamic_call.dart.weak.outline.expect
new file mode 100644
index 00000000000..ffa9b8995b8
--- /dev/null
+++ b/pkg/front_end/testcases/general/dynamic_call.dart.weak.outline.expect
@@ -0,0 +1,5 @@
+library;
+import self as self;
+
+static method method(dynamic d) → dynamic
+  ;
diff --git a/pkg/front_end/testcases/general/dynamic_call.dart.weak.transformed.expect b/pkg/front_end/testcases/general/dynamic_call.dart.weak.transformed.expect
new file mode 100644
index 00000000000..d5958ec2ea3
--- /dev/null
+++ b/pkg/front_end/testcases/general/dynamic_call.dart.weak.transformed.expect
@@ -0,0 +1,7 @@
+library;
+import self as self;
+
+static method method(dynamic d) → dynamic {
+  d{dynamic}();
+  d{dynamic}.call();
+}
diff --git a/pkg/front_end/testcases/general/escape.dart.strong.expect b/pkg/front_end/testcases/general/escape.dart.strong.expect
index 66ff79dda13..1c642025173 100644
--- a/pkg/front_end/testcases/general/escape.dart.strong.expect
+++ b/pkg/front_end/testcases/general/escape.dart.strong.expect
@@ -38,7 +38,7 @@ static method escape(dynamic x) → void {
   x == null ?{dynamic} x = "" : null;
   x == null ?{dynamic} x = 45 : null;
   if(!(x is core::int) && !(x is core::String)) {
-    x{dynamic}.field = 45;
+    x.{dynamic}field = 45;
   }
 }
 static method main() → dynamic {
diff --git a/pkg/front_end/testcases/general/escape.dart.strong.transformed.expect b/pkg/front_end/testcases/general/escape.dart.strong.transformed.expect
index 66ff79dda13..1c642025173 100644
--- a/pkg/front_end/testcases/general/escape.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/escape.dart.strong.transformed.expect
@@ -38,7 +38,7 @@ static method escape(dynamic x) → void {
   x == null ?{dynamic} x = "" : null;
   x == null ?{dynamic} x = 45 : null;
   if(!(x is core::int) && !(x is core::String)) {
-    x{dynamic}.field = 45;
+    x.{dynamic}field = 45;
   }
 }
 static method main() → dynamic {
diff --git a/pkg/front_end/testcases/general/escape.dart.weak.expect b/pkg/front_end/testcases/general/escape.dart.weak.expect
index 66ff79dda13..1c642025173 100644
--- a/pkg/front_end/testcases/general/escape.dart.weak.expect
+++ b/pkg/front_end/testcases/general/escape.dart.weak.expect
@@ -38,7 +38,7 @@ static method escape(dynamic x) → void {
   x == null ?{dynamic} x = "" : null;
   x == null ?{dynamic} x = 45 : null;
   if(!(x is core::int) && !(x is core::String)) {
-    x{dynamic}.field = 45;
+    x.{dynamic}field = 45;
   }
 }
 static method main() → dynamic {
diff --git a/pkg/front_end/testcases/general/escape.dart.weak.modular.expect b/pkg/front_end/testcases/general/escape.dart.weak.modular.expect
index 66ff79dda13..1c642025173 100644
--- a/pkg/front_end/testcases/general/escape.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/escape.dart.weak.modular.expect
@@ -38,7 +38,7 @@ static method escape(dynamic x) → void {
   x == null ?{dynamic} x = "" : null;
   x == null ?{dynamic} x = 45 : null;
   if(!(x is core::int) && !(x is core::String)) {
-    x{dynamic}.field = 45;
+    x.{dynamic}field = 45;
   }
 }
 static method main() → dynamic {
diff --git a/pkg/front_end/testcases/general/escape.dart.weak.transformed.expect b/pkg/front_end/testcases/general/escape.dart.weak.transformed.expect
index 66ff79dda13..1c642025173 100644
--- a/pkg/front_end/testcases/general/escape.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/escape.dart.weak.transformed.expect
@@ -38,7 +38,7 @@ static method escape(dynamic x) → void {
   x == null ?{dynamic} x = "" : null;
   x == null ?{dynamic} x = 45 : null;
   if(!(x is core::int) && !(x is core::String)) {
-    x{dynamic}.field = 45;
+    x.{dynamic}field = 45;
   }
 }
 static method main() → dynamic {
diff --git a/pkg/front_end/testcases/general/expressions.dart.strong.expect b/pkg/front_end/testcases/general/expressions.dart.strong.expect
index 440fb774c7f..5152969448f 100644
--- a/pkg/front_end/testcases/general/expressions.dart.strong.expect
+++ b/pkg/front_end/testcases/general/expressions.dart.strong.expect
@@ -13,7 +13,7 @@ static method foo({dynamic fisk = #C1}) → dynamic {
   core::print(fisk);
 }
 static method caller(dynamic f) → dynamic {
-  f{dynamic}.call();
+  f{dynamic}();
 }
 static method main() → dynamic {
   core::int i = 0;
diff --git a/pkg/front_end/testcases/general/expressions.dart.strong.transformed.expect b/pkg/front_end/testcases/general/expressions.dart.strong.transformed.expect
index 61fe045092b..743772bf867 100644
--- a/pkg/front_end/testcases/general/expressions.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/expressions.dart.strong.transformed.expect
@@ -13,7 +13,7 @@ static method foo({dynamic fisk = #C1}) → dynamic {
   core::print(fisk);
 }
 static method caller(dynamic f) → dynamic {
-  f{dynamic}.call();
+  f{dynamic}();
 }
 static method main() → dynamic {
   core::int i = 0;
diff --git a/pkg/front_end/testcases/general/expressions.dart.weak.expect b/pkg/front_end/testcases/general/expressions.dart.weak.expect
index 5c842fa553d..770b9b5e1a2 100644
--- a/pkg/front_end/testcases/general/expressions.dart.weak.expect
+++ b/pkg/front_end/testcases/general/expressions.dart.weak.expect
@@ -13,7 +13,7 @@ static method foo({dynamic fisk = #C1}) → dynamic {
   core::print(fisk);
 }
 static method caller(dynamic f) → dynamic {
-  f{dynamic}.call();
+  f{dynamic}();
 }
 static method main() → dynamic {
   core::int i = 0;
diff --git a/pkg/front_end/testcases/general/expressions.dart.weak.modular.expect b/pkg/front_end/testcases/general/expressions.dart.weak.modular.expect
index 5c842fa553d..770b9b5e1a2 100644
--- a/pkg/front_end/testcases/general/expressions.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/expressions.dart.weak.modular.expect
@@ -13,7 +13,7 @@ static method foo({dynamic fisk = #C1}) → dynamic {
   core::print(fisk);
 }
 static method caller(dynamic f) → dynamic {
-  f{dynamic}.call();
+  f{dynamic}();
 }
 static method main() → dynamic {
   core::int i = 0;
diff --git a/pkg/front_end/testcases/general/expressions.dart.weak.transformed.expect b/pkg/front_end/testcases/general/expressions.dart.weak.transformed.expect
index 4640f73351b..ad85a015e5a 100644
--- a/pkg/front_end/testcases/general/expressions.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/expressions.dart.weak.transformed.expect
@@ -13,7 +13,7 @@ static method foo({dynamic fisk = #C1}) → dynamic {
   core::print(fisk);
 }
 static method caller(dynamic f) → dynamic {
-  f{dynamic}.call();
+  f{dynamic}();
 }
 static method main() → dynamic {
   core::int i = 0;
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 74d1b560286..2f919b9e947 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
@@ -129,7 +129,7 @@ class C extends self::Super {
  - '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 class '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 []) {}
@@ -140,14 +140,14 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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;
+         ^^^^^^^^^^" 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'.
  - '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 class '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 55d2dff13f0..a2e18926795 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
@@ -205,7 +205,7 @@ class C extends self::Super {
  - '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 class '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 []) {}
@@ -222,7 +222,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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;
+         ^^^^^^^^^^" in this{<unresolved>}.unresolved.{<invalid>}foo = #t14;
         }
       }
     }
@@ -235,7 +235,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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 class '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.weak.expect b/pkg/front_end/testcases/general/for_in_without_declaration.dart.weak.expect
index 74d1b560286..2f919b9e947 100644
--- a/pkg/front_end/testcases/general/for_in_without_declaration.dart.weak.expect
+++ b/pkg/front_end/testcases/general/for_in_without_declaration.dart.weak.expect
@@ -129,7 +129,7 @@ class C extends self::Super {
  - '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 class '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 []) {}
@@ -140,14 +140,14 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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;
+         ^^^^^^^^^^" 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'.
  - '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 class '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.weak.modular.expect b/pkg/front_end/testcases/general/for_in_without_declaration.dart.weak.modular.expect
index 74d1b560286..2f919b9e947 100644
--- a/pkg/front_end/testcases/general/for_in_without_declaration.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/for_in_without_declaration.dart.weak.modular.expect
@@ -129,7 +129,7 @@ class C extends self::Super {
  - '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 class '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 []) {}
@@ -140,14 +140,14 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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;
+         ^^^^^^^^^^" 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'.
  - '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 class '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.weak.transformed.expect b/pkg/front_end/testcases/general/for_in_without_declaration.dart.weak.transformed.expect
index 55d2dff13f0..a2e18926795 100644
--- a/pkg/front_end/testcases/general/for_in_without_declaration.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/for_in_without_declaration.dart.weak.transformed.expect
@@ -205,7 +205,7 @@ class C extends self::Super {
  - '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 class '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 []) {}
@@ -222,7 +222,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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;
+         ^^^^^^^^^^" in this{<unresolved>}.unresolved.{<invalid>}foo = #t14;
         }
       }
     }
@@ -235,7 +235,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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 class '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/issue47223b.dart.strong.expect b/pkg/front_end/testcases/general/issue47223b.dart.strong.expect
index 2a44817c9e3..b4f8918aae3 100644
--- a/pkg/front_end/testcases/general/issue47223b.dart.strong.expect
+++ b/pkg/front_end/testcases/general/issue47223b.dart.strong.expect
@@ -10,6 +10,6 @@ import self as self;
 import "dart:core" as core;
 
 static method test() → void {
-  let final Never #t1 = throw "some value" in #t1{Never}.foo == null ?{core::String} #t1{Never}.foo = "foo" : null;
+  let final Never #t1 = throw "some value" in #t1{Never}.foo == null ?{core::String} #t1.{Never}foo = "foo" : null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/issue47223b.dart.strong.transformed.expect b/pkg/front_end/testcases/general/issue47223b.dart.strong.transformed.expect
index 2a44817c9e3..b4f8918aae3 100644
--- a/pkg/front_end/testcases/general/issue47223b.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/issue47223b.dart.strong.transformed.expect
@@ -10,6 +10,6 @@ import self as self;
 import "dart:core" as core;
 
 static method test() → void {
-  let final Never #t1 = throw "some value" in #t1{Never}.foo == null ?{core::String} #t1{Never}.foo = "foo" : null;
+  let final Never #t1 = throw "some value" in #t1{Never}.foo == null ?{core::String} #t1.{Never}foo = "foo" : null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/issue47223b.dart.weak.expect b/pkg/front_end/testcases/general/issue47223b.dart.weak.expect
index 2a44817c9e3..b4f8918aae3 100644
--- a/pkg/front_end/testcases/general/issue47223b.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue47223b.dart.weak.expect
@@ -10,6 +10,6 @@ import self as self;
 import "dart:core" as core;
 
 static method test() → void {
-  let final Never #t1 = throw "some value" in #t1{Never}.foo == null ?{core::String} #t1{Never}.foo = "foo" : null;
+  let final Never #t1 = throw "some value" in #t1{Never}.foo == null ?{core::String} #t1.{Never}foo = "foo" : null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/issue47223b.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue47223b.dart.weak.modular.expect
index 2a44817c9e3..b4f8918aae3 100644
--- a/pkg/front_end/testcases/general/issue47223b.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue47223b.dart.weak.modular.expect
@@ -10,6 +10,6 @@ import self as self;
 import "dart:core" as core;
 
 static method test() → void {
-  let final Never #t1 = throw "some value" in #t1{Never}.foo == null ?{core::String} #t1{Never}.foo = "foo" : null;
+  let final Never #t1 = throw "some value" in #t1{Never}.foo == null ?{core::String} #t1.{Never}foo = "foo" : null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/issue47223b.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue47223b.dart.weak.transformed.expect
index 2a44817c9e3..b4f8918aae3 100644
--- a/pkg/front_end/testcases/general/issue47223b.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue47223b.dart.weak.transformed.expect
@@ -10,6 +10,6 @@ import self as self;
 import "dart:core" as core;
 
 static method test() → void {
-  let final Never #t1 = throw "some value" in #t1{Never}.foo == null ?{core::String} #t1{Never}.foo = "foo" : null;
+  let final Never #t1 = throw "some value" in #t1{Never}.foo == null ?{core::String} #t1.{Never}foo = "foo" : null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/issue49122.dart.strong.expect b/pkg/front_end/testcases/general/issue49122.dart.strong.expect
index bc3e08b70c7..245076ee794 100644
--- a/pkg/front_end/testcases/general/issue49122.dart.strong.expect
+++ b/pkg/front_end/testcases/general/issue49122.dart.strong.expect
@@ -10,7 +10,7 @@ import self as self;
 import "dart:core" as core;
 
 static method test(dynamic x) → dynamic
-  return x{dynamic}.call();
+  return x{dynamic}();
 static method test2() → void {
   self::test( block {
     function bar() → Null {
diff --git a/pkg/front_end/testcases/general/issue49122.dart.strong.transformed.expect b/pkg/front_end/testcases/general/issue49122.dart.strong.transformed.expect
index bc3e08b70c7..245076ee794 100644
--- a/pkg/front_end/testcases/general/issue49122.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/issue49122.dart.strong.transformed.expect
@@ -10,7 +10,7 @@ import self as self;
 import "dart:core" as core;
 
 static method test(dynamic x) → dynamic
-  return x{dynamic}.call();
+  return x{dynamic}();
 static method test2() → void {
   self::test( block {
     function bar() → Null {
diff --git a/pkg/front_end/testcases/general/issue49122.dart.weak.expect b/pkg/front_end/testcases/general/issue49122.dart.weak.expect
index bc3e08b70c7..245076ee794 100644
--- a/pkg/front_end/testcases/general/issue49122.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue49122.dart.weak.expect
@@ -10,7 +10,7 @@ import self as self;
 import "dart:core" as core;
 
 static method test(dynamic x) → dynamic
-  return x{dynamic}.call();
+  return x{dynamic}();
 static method test2() → void {
   self::test( block {
     function bar() → Null {
diff --git a/pkg/front_end/testcases/general/issue49122.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue49122.dart.weak.modular.expect
index bc3e08b70c7..245076ee794 100644
--- a/pkg/front_end/testcases/general/issue49122.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue49122.dart.weak.modular.expect
@@ -10,7 +10,7 @@ import self as self;
 import "dart:core" as core;
 
 static method test(dynamic x) → dynamic
-  return x{dynamic}.call();
+  return x{dynamic}();
 static method test2() → void {
   self::test( block {
     function bar() → Null {
diff --git a/pkg/front_end/testcases/general/issue49122.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue49122.dart.weak.transformed.expect
index bc3e08b70c7..245076ee794 100644
--- a/pkg/front_end/testcases/general/issue49122.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue49122.dart.weak.transformed.expect
@@ -10,7 +10,7 @@ import self as self;
 import "dart:core" as core;
 
 static method test(dynamic x) → dynamic
-  return x{dynamic}.call();
+  return x{dynamic}();
 static method test2() → void {
   self::test( block {
     function bar() → Null {
diff --git a/pkg/front_end/testcases/general/issue53052.dart.strong.expect b/pkg/front_end/testcases/general/issue53052.dart.strong.expect
index 51597aa9920..30f97c5598f 100644
--- a/pkg/front_end/testcases/general/issue53052.dart.strong.expect
+++ b/pkg/front_end/testcases/general/issue53052.dart.strong.expect
@@ -28,7 +28,7 @@ static method main() → dynamic async /* emittedValueType= dynamic */ {
 static method expectThrows(dynamic f) → dynamic {
   core::bool hasThrown = true;
   try {
-    f{dynamic}.call();
+    f{dynamic}();
     hasThrown = false;
   }
   on core::Object catch(final core::Object e) {
@@ -40,7 +40,7 @@ static method expectThrows(dynamic f) → dynamic {
 static method expectAsyncThrows(dynamic f) → dynamic async /* emittedValueType= dynamic */ {
   core::bool hasThrown = true;
   try {
-    await f{dynamic}.call() /* runtimeCheckType= asy::Future<dynamic> */ ;
+    await f{dynamic}() /* runtimeCheckType= asy::Future<dynamic> */ ;
     hasThrown = false;
   }
   on core::Object catch(final core::Object e) {
diff --git a/pkg/front_end/testcases/general/issue53052.dart.strong.transformed.expect b/pkg/front_end/testcases/general/issue53052.dart.strong.transformed.expect
index 8021b9cbc69..6b89de4bec8 100644
--- a/pkg/front_end/testcases/general/issue53052.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/issue53052.dart.strong.transformed.expect
@@ -28,7 +28,7 @@ static method main() → dynamic async /* emittedValueType= dynamic */ {
 static method expectThrows(dynamic f) → dynamic {
   core::bool hasThrown = true;
   try {
-    f{dynamic}.call();
+    f{dynamic}();
     hasThrown = false;
   }
   on core::Object catch(final core::Object e) {
@@ -40,7 +40,7 @@ static method expectThrows(dynamic f) → dynamic {
 static method expectAsyncThrows(dynamic f) → dynamic async /* emittedValueType= dynamic */ {
   core::bool hasThrown = true;
   try {
-    await f{dynamic}.call() /* runtimeCheckType= asy::Future<dynamic> */ ;
+    await f{dynamic}() /* runtimeCheckType= asy::Future<dynamic> */ ;
     hasThrown = false;
   }
   on core::Object catch(final core::Object e) {
diff --git a/pkg/front_end/testcases/general/issue53052.dart.weak.expect b/pkg/front_end/testcases/general/issue53052.dart.weak.expect
index 51597aa9920..30f97c5598f 100644
--- a/pkg/front_end/testcases/general/issue53052.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue53052.dart.weak.expect
@@ -28,7 +28,7 @@ static method main() → dynamic async /* emittedValueType= dynamic */ {
 static method expectThrows(dynamic f) → dynamic {
   core::bool hasThrown = true;
   try {
-    f{dynamic}.call();
+    f{dynamic}();
     hasThrown = false;
   }
   on core::Object catch(final core::Object e) {
@@ -40,7 +40,7 @@ static method expectThrows(dynamic f) → dynamic {
 static method expectAsyncThrows(dynamic f) → dynamic async /* emittedValueType= dynamic */ {
   core::bool hasThrown = true;
   try {
-    await f{dynamic}.call() /* runtimeCheckType= asy::Future<dynamic> */ ;
+    await f{dynamic}() /* runtimeCheckType= asy::Future<dynamic> */ ;
     hasThrown = false;
   }
   on core::Object catch(final core::Object e) {
diff --git a/pkg/front_end/testcases/general/issue53052.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue53052.dart.weak.modular.expect
index 51597aa9920..30f97c5598f 100644
--- a/pkg/front_end/testcases/general/issue53052.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue53052.dart.weak.modular.expect
@@ -28,7 +28,7 @@ static method main() → dynamic async /* emittedValueType= dynamic */ {
 static method expectThrows(dynamic f) → dynamic {
   core::bool hasThrown = true;
   try {
-    f{dynamic}.call();
+    f{dynamic}();
     hasThrown = false;
   }
   on core::Object catch(final core::Object e) {
@@ -40,7 +40,7 @@ static method expectThrows(dynamic f) → dynamic {
 static method expectAsyncThrows(dynamic f) → dynamic async /* emittedValueType= dynamic */ {
   core::bool hasThrown = true;
   try {
-    await f{dynamic}.call() /* runtimeCheckType= asy::Future<dynamic> */ ;
+    await f{dynamic}() /* runtimeCheckType= asy::Future<dynamic> */ ;
     hasThrown = false;
   }
   on core::Object catch(final core::Object e) {
diff --git a/pkg/front_end/testcases/general/issue53052.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue53052.dart.weak.transformed.expect
index 8021b9cbc69..6b89de4bec8 100644
--- a/pkg/front_end/testcases/general/issue53052.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue53052.dart.weak.transformed.expect
@@ -28,7 +28,7 @@ static method main() → dynamic async /* emittedValueType= dynamic */ {
 static method expectThrows(dynamic f) → dynamic {
   core::bool hasThrown = true;
   try {
-    f{dynamic}.call();
+    f{dynamic}();
     hasThrown = false;
   }
   on core::Object catch(final core::Object e) {
@@ -40,7 +40,7 @@ static method expectThrows(dynamic f) → dynamic {
 static method expectAsyncThrows(dynamic f) → dynamic async /* emittedValueType= dynamic */ {
   core::bool hasThrown = true;
   try {
-    await f{dynamic}.call() /* runtimeCheckType= asy::Future<dynamic> */ ;
+    await f{dynamic}() /* runtimeCheckType= asy::Future<dynamic> */ ;
     hasThrown = false;
   }
   on core::Object catch(final core::Object e) {
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 393629d2fdb..c57b09be334 100644
--- a/pkg/front_end/testcases/general/missing_toplevel.dart.strong.expect
+++ b/pkg/front_end/testcases/general/missing_toplevel.dart.strong.expect
@@ -87,5 +87,5 @@ static field core::int missingPropertySet = invalid-expression "pkg/front_end/te
  - '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;
-                                    ^^^^^^^^" in self::emptyClass{<unresolved>}.property = 42;
+                                    ^^^^^^^^" in self::emptyClass.{<unresolved>}property = 42;
 static method main() → dynamic {}
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 1ef237b5d4a..822e3e381ca 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
@@ -87,7 +87,7 @@ static field core::int missingPropertySet = invalid-expression "pkg/front_end/te
  - '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;
-                                    ^^^^^^^^" in self::emptyClass{<unresolved>}.property = 42;
+                                    ^^^^^^^^" in self::emptyClass.{<unresolved>}property = 42;
 static method main() → dynamic {}
 
 
diff --git a/pkg/front_end/testcases/general/missing_toplevel.dart.weak.expect b/pkg/front_end/testcases/general/missing_toplevel.dart.weak.expect
index 393629d2fdb..c57b09be334 100644
--- a/pkg/front_end/testcases/general/missing_toplevel.dart.weak.expect
+++ b/pkg/front_end/testcases/general/missing_toplevel.dart.weak.expect
@@ -87,5 +87,5 @@ static field core::int missingPropertySet = invalid-expression "pkg/front_end/te
  - '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;
-                                    ^^^^^^^^" in self::emptyClass{<unresolved>}.property = 42;
+                                    ^^^^^^^^" in self::emptyClass.{<unresolved>}property = 42;
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/missing_toplevel.dart.weak.modular.expect b/pkg/front_end/testcases/general/missing_toplevel.dart.weak.modular.expect
index 393629d2fdb..c57b09be334 100644
--- a/pkg/front_end/testcases/general/missing_toplevel.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/missing_toplevel.dart.weak.modular.expect
@@ -87,5 +87,5 @@ static field core::int missingPropertySet = invalid-expression "pkg/front_end/te
  - '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;
-                                    ^^^^^^^^" in self::emptyClass{<unresolved>}.property = 42;
+                                    ^^^^^^^^" in self::emptyClass.{<unresolved>}property = 42;
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/missing_toplevel.dart.weak.transformed.expect b/pkg/front_end/testcases/general/missing_toplevel.dart.weak.transformed.expect
index 1ef237b5d4a..822e3e381ca 100644
--- a/pkg/front_end/testcases/general/missing_toplevel.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/missing_toplevel.dart.weak.transformed.expect
@@ -87,7 +87,7 @@ static field core::int missingPropertySet = invalid-expression "pkg/front_end/te
  - '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;
-                                    ^^^^^^^^" in self::emptyClass{<unresolved>}.property = 42;
+                                    ^^^^^^^^" in self::emptyClass.{<unresolved>}property = 42;
 static method main() → dynamic {}
 
 
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 e5600f100e4..9dd0c003511 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
@@ -53,7 +53,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^^" 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'.
  - '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'.
@@ -68,7 +68,7 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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 class '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 e5600f100e4..9dd0c003511 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
@@ -53,7 +53,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^^" 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'.
  - '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'.
@@ -68,7 +68,7 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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 class '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.weak.expect b/pkg/front_end/testcases/general/private_member_access.dart.weak.expect
index e5600f100e4..9dd0c003511 100644
--- a/pkg/front_end/testcases/general/private_member_access.dart.weak.expect
+++ b/pkg/front_end/testcases/general/private_member_access.dart.weak.expect
@@ -53,7 +53,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^^" 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'.
  - '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'.
@@ -68,7 +68,7 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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 class '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.weak.modular.expect b/pkg/front_end/testcases/general/private_member_access.dart.weak.modular.expect
index e5600f100e4..9dd0c003511 100644
--- a/pkg/front_end/testcases/general/private_member_access.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/private_member_access.dart.weak.modular.expect
@@ -53,7 +53,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^^" 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'.
  - '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'.
@@ -68,7 +68,7 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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 class '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.weak.transformed.expect b/pkg/front_end/testcases/general/private_member_access.dart.weak.transformed.expect
index e5600f100e4..9dd0c003511 100644
--- a/pkg/front_end/testcases/general/private_member_access.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/private_member_access.dart.weak.transformed.expect
@@ -53,7 +53,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^^" 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'.
  - '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'.
@@ -68,7 +68,7 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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 class '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 8ac64f1a9e3..652fc7cf1f4 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
@@ -143,7 +143,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     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'.
 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::_();
+            ^^^" 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'.
  - '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'.
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 8ac64f1a9e3..652fc7cf1f4 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
@@ -143,7 +143,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     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'.
 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::_();
+            ^^^" 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'.
  - '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'.
diff --git a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.expect b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.expect
index 8ac64f1a9e3..652fc7cf1f4 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.expect
@@ -143,7 +143,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     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'.
 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::_();
+            ^^^" 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'.
  - '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'.
diff --git a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.modular.expect b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.modular.expect
index 8ac64f1a9e3..652fc7cf1f4 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.modular.expect
@@ -143,7 +143,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     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'.
 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::_();
+            ^^^" 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'.
  - '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'.
diff --git a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.transformed.expect b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.transformed.expect
index 8ac64f1a9e3..652fc7cf1f4 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_invocation_in_invalid.dart.weak.transformed.expect
@@ -143,7 +143,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
     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'.
 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::_();
+            ^^^" 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'.
  - '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'.
diff --git a/pkg/front_end/testcases/general/undefined.dart.strong.expect b/pkg/front_end/testcases/general/undefined.dart.strong.expect
index 3f37003c947..a983cb547c9 100644
--- a/pkg/front_end/testcases/general/undefined.dart.strong.expect
+++ b/pkg/front_end/testcases/general/undefined.dart.strong.expect
@@ -48,6 +48,6 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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;
-    ^" in c{<unresolved>}.y = null;
+    ^" in c.{<unresolved>}y = null;
 }
 static method main() → dynamic {}
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 3f37003c947..a983cb547c9 100644
--- a/pkg/front_end/testcases/general/undefined.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/undefined.dart.strong.transformed.expect
@@ -48,6 +48,6 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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;
-    ^" in c{<unresolved>}.y = null;
+    ^" in c.{<unresolved>}y = null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/undefined.dart.weak.expect b/pkg/front_end/testcases/general/undefined.dart.weak.expect
index 3f37003c947..a983cb547c9 100644
--- a/pkg/front_end/testcases/general/undefined.dart.weak.expect
+++ b/pkg/front_end/testcases/general/undefined.dart.weak.expect
@@ -48,6 +48,6 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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;
-    ^" in c{<unresolved>}.y = null;
+    ^" in c.{<unresolved>}y = null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/undefined.dart.weak.modular.expect b/pkg/front_end/testcases/general/undefined.dart.weak.modular.expect
index 3f37003c947..a983cb547c9 100644
--- a/pkg/front_end/testcases/general/undefined.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/undefined.dart.weak.modular.expect
@@ -48,6 +48,6 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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;
-    ^" in c{<unresolved>}.y = null;
+    ^" in c.{<unresolved>}y = null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/undefined.dart.weak.transformed.expect b/pkg/front_end/testcases/general/undefined.dart.weak.transformed.expect
index 3f37003c947..a983cb547c9 100644
--- a/pkg/front_end/testcases/general/undefined.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/undefined.dart.weak.transformed.expect
@@ -48,6 +48,6 @@ Try correcting the name to the name of an existing method, or defining a method
  - '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;
-    ^" in c{<unresolved>}.y = null;
+    ^" in c.{<unresolved>}y = null;
 }
 static method main() → dynamic {}
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 707f5da3057..26ccc741597 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
@@ -93,7 +93,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+         ^^^^^^^^^^^^" 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'.
  - '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'.
@@ -108,7 +108,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^" 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'.
  - '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'.
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 707f5da3057..26ccc741597 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
@@ -93,7 +93,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+         ^^^^^^^^^^^^" 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'.
  - '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'.
@@ -108,7 +108,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^" 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'.
  - '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'.
diff --git a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.expect b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.expect
index 707f5da3057..26ccc741597 100644
--- a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.expect
+++ b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.expect
@@ -93,7 +93,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+         ^^^^^^^^^^^^" 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'.
  - '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'.
@@ -108,7 +108,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^" 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'.
  - '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'.
diff --git a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.modular.expect b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.modular.expect
index 707f5da3057..26ccc741597 100644
--- a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.modular.expect
@@ -93,7 +93,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+         ^^^^^^^^^^^^" 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'.
  - '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'.
@@ -108,7 +108,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^" 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'.
  - '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'.
diff --git a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.transformed.expect b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.transformed.expect
index 707f5da3057..26ccc741597 100644
--- a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.weak.transformed.expect
@@ -93,7 +93,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+         ^^^^^^^^^^^^" 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'.
  - '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'.
@@ -108,7 +108,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
  - '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;
+    ^^^^^^^^^^^^" 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'.
  - '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'.
diff --git a/pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.1.expect
index b454911f12d..52b5e8a21ab 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.1.expect
@@ -23,7 +23,7 @@ library from "org-dartlang-test:///main.dart" as main {
       dart.core::print("bar 1");
     }
     method callBar() → void {
-      invalid-expression "org-dartlang-test:///main.dart:9:5: Error: Can't use 'bar' because it is declared more than once.\n    bar();\n    ^"{dynamic}.call();
+      invalid-expression "org-dartlang-test:///main.dart:9:5: Error: Can't use 'bar' because it is declared more than once.\n    bar();\n    ^"{dynamic}();
     }
   }
 }
diff --git a/pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.2.expect
index b454911f12d..52b5e8a21ab 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.2.expect
@@ -23,7 +23,7 @@ library from "org-dartlang-test:///main.dart" as main {
       dart.core::print("bar 1");
     }
     method callBar() → void {
-      invalid-expression "org-dartlang-test:///main.dart:9:5: Error: Can't use 'bar' because it is declared more than once.\n    bar();\n    ^"{dynamic}.call();
+      invalid-expression "org-dartlang-test:///main.dart:9:5: Error: Can't use 'bar' because it is declared more than once.\n    bar();\n    ^"{dynamic}();
     }
   }
 }
diff --git a/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.strong.expect b/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.strong.expect
index ee4eb5d78dc..b1b72e779c1 100644
--- a/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.strong.expect
+++ b/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.strong.expect
@@ -24,9 +24,9 @@ static field core::int intValue = 0;
 static field core::num numValue = 0;
 static field core::double doubleValue = 0.0;
 static field invalid-type a = () → core::num => self::intValue.{core::num::+}(self::b as{TypeError,ForDynamic} core::num){(core::num) → core::num};
-static field dynamic b = self::a{dynamic}.call();
+static field dynamic b = self::a{dynamic}();
 static field invalid-type c = () → core::num => self::numValue.{core::num::+}(self::d as{TypeError,ForDynamic} core::num){(core::num) → core::num};
-static field dynamic d = self::c{dynamic}.call();
+static field dynamic d = self::c{dynamic}();
 static field invalid-type e = () → core::double => self::doubleValue.{core::double::+}(self::f as{TypeError,ForDynamic} core::num){(core::num) → core::double};
-static field dynamic f = self::e{dynamic}.call();
+static field dynamic f = self::e{dynamic}();
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.strong.transformed.expect b/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.strong.transformed.expect
index ee4eb5d78dc..b1b72e779c1 100644
--- a/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.strong.transformed.expect
@@ -24,9 +24,9 @@ static field core::int intValue = 0;
 static field core::num numValue = 0;
 static field core::double doubleValue = 0.0;
 static field invalid-type a = () → core::num => self::intValue.{core::num::+}(self::b as{TypeError,ForDynamic} core::num){(core::num) → core::num};
-static field dynamic b = self::a{dynamic}.call();
+static field dynamic b = self::a{dynamic}();
 static field invalid-type c = () → core::num => self::numValue.{core::num::+}(self::d as{TypeError,ForDynamic} core::num){(core::num) → core::num};
-static field dynamic d = self::c{dynamic}.call();
+static field dynamic d = self::c{dynamic}();
 static field invalid-type e = () → core::double => self::doubleValue.{core::double::+}(self::f as{TypeError,ForDynamic} core::num){(core::num) → core::double};
-static field dynamic f = self::e{dynamic}.call();
+static field dynamic f = self::e{dynamic}();
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.expect b/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.expect
index ee4eb5d78dc..b1b72e779c1 100644
--- a/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.expect
+++ b/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.expect
@@ -24,9 +24,9 @@ static field core::int intValue = 0;
 static field core::num numValue = 0;
 static field core::double doubleValue = 0.0;
 static field invalid-type a = () → core::num => self::intValue.{core::num::+}(self::b as{TypeError,ForDynamic} core::num){(core::num) → core::num};
-static field dynamic b = self::a{dynamic}.call();
+static field dynamic b = self::a{dynamic}();
 static field invalid-type c = () → core::num => self::numValue.{core::num::+}(self::d as{TypeError,ForDynamic} core::num){(core::num) → core::num};
-static field dynamic d = self::c{dynamic}.call();
+static field dynamic d = self::c{dynamic}();
 static field invalid-type e = () → core::double => self::doubleValue.{core::double::+}(self::f as{TypeError,ForDynamic} core::num){(core::num) → core::double};
-static field dynamic f = self::e{dynamic}.call();
+static field dynamic f = self::e{dynamic}();
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.modular.expect b/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.modular.expect
index ee4eb5d78dc..b1b72e779c1 100644
--- a/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.modular.expect
@@ -24,9 +24,9 @@ static field core::int intValue = 0;
 static field core::num numValue = 0;
 static field core::double doubleValue = 0.0;
 static field invalid-type a = () → core::num => self::intValue.{core::num::+}(self::b as{TypeError,ForDynamic} core::num){(core::num) → core::num};
-static field dynamic b = self::a{dynamic}.call();
+static field dynamic b = self::a{dynamic}();
 static field invalid-type c = () → core::num => self::numValue.{core::num::+}(self::d as{TypeError,ForDynamic} core::num){(core::num) → core::num};
-static field dynamic d = self::c{dynamic}.call();
+static field dynamic d = self::c{dynamic}();
 static field invalid-type e = () → core::double => self::doubleValue.{core::double::+}(self::f as{TypeError,ForDynamic} core::num){(core::num) → core::double};
-static field dynamic f = self::e{dynamic}.call();
+static field dynamic f = self::e{dynamic}();
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.transformed.expect b/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.transformed.expect
index ee4eb5d78dc..b1b72e779c1 100644
--- a/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference_new/dependency_only_if_overloaded.dart.weak.transformed.expect
@@ -24,9 +24,9 @@ static field core::int intValue = 0;
 static field core::num numValue = 0;
 static field core::double doubleValue = 0.0;
 static field invalid-type a = () → core::num => self::intValue.{core::num::+}(self::b as{TypeError,ForDynamic} core::num){(core::num) → core::num};
-static field dynamic b = self::a{dynamic}.call();
+static field dynamic b = self::a{dynamic}();
 static field invalid-type c = () → core::num => self::numValue.{core::num::+}(self::d as{TypeError,ForDynamic} core::num){(core::num) → core::num};
-static field dynamic d = self::c{dynamic}.call();
+static field dynamic d = self::c{dynamic}();
 static field invalid-type e = () → core::double => self::doubleValue.{core::double::+}(self::f as{TypeError,ForDynamic} core::num){(core::num) → core::double};
-static field dynamic f = self::e{dynamic}.call();
+static field dynamic f = self::e{dynamic}();
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.strong.expect b/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.strong.expect
index d3f669efb81..ac8d5d69fc7 100644
--- a/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.strong.expect
+++ b/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.strong.expect
@@ -58,9 +58,9 @@ static method test(dynamic d, core::Function f, self::A a) → dynamic {
   new self::A::•(1, 2, z: 3);
   let final core::int #t19 = 1 in let final core::int #t20 = 2 in new self::A::•(#t19, 3, z: #t20);
   let final core::int #t21 = 1 in new self::A::•(2, 3, z: #t21);
-  d{dynamic}.call(1, 2, z: 3);
-  let final core::int #t22 = 1 in let final core::int #t23 = 2 in d{dynamic}.call(#t22, 3, z: #t23);
-  let final core::int #t24 = 1 in d{dynamic}.call(2, 3, z: #t24);
+  d{dynamic}(1, 2, z: 3);
+  let final core::int #t22 = 1 in let final core::int #t23 = 2 in d{dynamic}(#t22, 3, z: #t23);
+  let final core::int #t24 = 1 in d{dynamic}(2, 3, z: #t24);
   f(1, 2, z: 3);
   let final core::int #t25 = 1 in let final core::int #t26 = 2 in f(#t25, 3, z: #t26);
   let final core::int #t27 = 1 in f(2, 3, z: #t27);
diff --git a/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.strong.transformed.expect b/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.strong.transformed.expect
index f089689af82..0faca003c26 100644
--- a/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.strong.transformed.expect
@@ -58,9 +58,9 @@ static method test(dynamic d, core::Function f, self::A a) → dynamic {
   new self::A::•(1, 2, z: 3);
   let final core::int #t19 = 1 in let final core::int #t20 = 2 in new self::A::•(#t19, 3, z: #t20);
   let final core::int #t21 = 1 in new self::A::•(2, 3, z: #t21);
-  d{dynamic}.call(1, 2, z: 3);
-  let final core::int #t22 = 1 in let final core::int #t23 = 2 in d{dynamic}.call(#t22, 3, z: #t23);
-  let final core::int #t24 = 1 in d{dynamic}.call(2, 3, z: #t24);
+  d{dynamic}(1, 2, z: 3);
+  let final core::int #t22 = 1 in let final core::int #t23 = 2 in d{dynamic}(#t22, 3, z: #t23);
+  let final core::int #t24 = 1 in d{dynamic}(2, 3, z: #t24);
   f(1, 2, z: 3);
   let final core::int #t25 = 1 in let final core::int #t26 = 2 in f(#t25, 3, z: #t26);
   let final core::int #t27 = 1 in f(2, 3, z: #t27);
diff --git a/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.expect b/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.expect
index d3f669efb81..ac8d5d69fc7 100644
--- a/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.expect
+++ b/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.expect
@@ -58,9 +58,9 @@ static method test(dynamic d, core::Function f, self::A a) → dynamic {
   new self::A::•(1, 2, z: 3);
   let final core::int #t19 = 1 in let final core::int #t20 = 2 in new self::A::•(#t19, 3, z: #t20);
   let final core::int #t21 = 1 in new self::A::•(2, 3, z: #t21);
-  d{dynamic}.call(1, 2, z: 3);
-  let final core::int #t22 = 1 in let final core::int #t23 = 2 in d{dynamic}.call(#t22, 3, z: #t23);
-  let final core::int #t24 = 1 in d{dynamic}.call(2, 3, z: #t24);
+  d{dynamic}(1, 2, z: 3);
+  let final core::int #t22 = 1 in let final core::int #t23 = 2 in d{dynamic}(#t22, 3, z: #t23);
+  let final core::int #t24 = 1 in d{dynamic}(2, 3, z: #t24);
   f(1, 2, z: 3);
   let final core::int #t25 = 1 in let final core::int #t26 = 2 in f(#t25, 3, z: #t26);
   let final core::int #t27 = 1 in f(2, 3, z: #t27);
diff --git a/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.modular.expect b/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.modular.expect
index d3f669efb81..ac8d5d69fc7 100644
--- a/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.modular.expect
@@ -58,9 +58,9 @@ static method test(dynamic d, core::Function f, self::A a) → dynamic {
   new self::A::•(1, 2, z: 3);
   let final core::int #t19 = 1 in let final core::int #t20 = 2 in new self::A::•(#t19, 3, z: #t20);
   let final core::int #t21 = 1 in new self::A::•(2, 3, z: #t21);
-  d{dynamic}.call(1, 2, z: 3);
-  let final core::int #t22 = 1 in let final core::int #t23 = 2 in d{dynamic}.call(#t22, 3, z: #t23);
-  let final core::int #t24 = 1 in d{dynamic}.call(2, 3, z: #t24);
+  d{dynamic}(1, 2, z: 3);
+  let final core::int #t22 = 1 in let final core::int #t23 = 2 in d{dynamic}(#t22, 3, z: #t23);
+  let final core::int #t24 = 1 in d{dynamic}(2, 3, z: #t24);
   f(1, 2, z: 3);
   let final core::int #t25 = 1 in let final core::int #t26 = 2 in f(#t25, 3, z: #t26);
   let final core::int #t27 = 1 in f(2, 3, z: #t27);
diff --git a/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.transformed.expect b/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.transformed.expect
index f089689af82..0faca003c26 100644
--- a/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/named_arguments_anywhere/all_kinds.dart.weak.transformed.expect
@@ -58,9 +58,9 @@ static method test(dynamic d, core::Function f, self::A a) → dynamic {
   new self::A::•(1, 2, z: 3);
   let final core::int #t19 = 1 in let final core::int #t20 = 2 in new self::A::•(#t19, 3, z: #t20);
   let final core::int #t21 = 1 in new self::A::•(2, 3, z: #t21);
-  d{dynamic}.call(1, 2, z: 3);
-  let final core::int #t22 = 1 in let final core::int #t23 = 2 in d{dynamic}.call(#t22, 3, z: #t23);
-  let final core::int #t24 = 1 in d{dynamic}.call(2, 3, z: #t24);
+  d{dynamic}(1, 2, z: 3);
+  let final core::int #t22 = 1 in let final core::int #t23 = 2 in d{dynamic}(#t22, 3, z: #t23);
+  let final core::int #t24 = 1 in d{dynamic}(2, 3, z: #t24);
   f(1, 2, z: 3);
   let final core::int #t25 = 1 in let final core::int #t26 = 2 in f(#t25, 3, z: #t26);
   let final core::int #t27 = 1 in f(2, 3, z: #t27);
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 b56fa4bffcb..8323460dd3b 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
@@ -332,7 +332,7 @@ Try correcting the name to the name of an existing method, or defining a method
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:84:6: Error: The getter 'instanceMethod' isn't defined for the class '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}.call();
+     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:85:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
   c.instanceGetter;
@@ -340,7 +340,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:86:5: Error: The setter 'instanceSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^" in c.{<unresolved>}instanceSetter = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:87:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
   c.instanceField;
@@ -348,7 +348,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:88:5: Error: The setter 'instanceField' isn't defined for the class '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;
+    ^^^^^^^^^^^^^" in c.{<unresolved>}instanceField = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:89:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1;
@@ -356,7 +356,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:90:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter1 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:91:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
@@ -364,7 +364,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:92:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter2 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:93:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1;
@@ -372,7 +372,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:94:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter1 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:95:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
@@ -380,7 +380,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:96:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter2 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:97:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter;
@@ -392,7 +392,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:99:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndDuplicateSetter = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:100:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter;
@@ -400,7 +400,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:101:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndDuplicateSetter = 0;
 }
 static method main() → dynamic {
   core::int c = 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 b56fa4bffcb..8323460dd3b 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
@@ -332,7 +332,7 @@ Try correcting the name to the name of an existing method, or defining a method
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:84:6: Error: The getter 'instanceMethod' isn't defined for the class '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}.call();
+     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:85:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
   c.instanceGetter;
@@ -340,7 +340,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:86:5: Error: The setter 'instanceSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^" in c.{<unresolved>}instanceSetter = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:87:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
   c.instanceField;
@@ -348,7 +348,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:88:5: Error: The setter 'instanceField' isn't defined for the class '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;
+    ^^^^^^^^^^^^^" in c.{<unresolved>}instanceField = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:89:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1;
@@ -356,7 +356,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:90:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter1 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:91:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
@@ -364,7 +364,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:92:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter2 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:93:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1;
@@ -372,7 +372,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:94:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter1 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:95:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
@@ -380,7 +380,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:96:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter2 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:97:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter;
@@ -392,7 +392,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:99:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndDuplicateSetter = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:100:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter;
@@ -400,7 +400,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:101:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndDuplicateSetter = 0;
 }
 static method main() → dynamic {
   core::int c = 0;
diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.expect b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.expect
index b56fa4bffcb..8323460dd3b 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.expect
@@ -332,7 +332,7 @@ Try correcting the name to the name of an existing method, or defining a method
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:84:6: Error: The getter 'instanceMethod' isn't defined for the class '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}.call();
+     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:85:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
   c.instanceGetter;
@@ -340,7 +340,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:86:5: Error: The setter 'instanceSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^" in c.{<unresolved>}instanceSetter = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:87:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
   c.instanceField;
@@ -348,7 +348,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:88:5: Error: The setter 'instanceField' isn't defined for the class '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;
+    ^^^^^^^^^^^^^" in c.{<unresolved>}instanceField = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:89:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1;
@@ -356,7 +356,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:90:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter1 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:91:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
@@ -364,7 +364,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:92:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter2 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:93:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1;
@@ -372,7 +372,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:94:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter1 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:95:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
@@ -380,7 +380,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:96:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter2 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:97:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter;
@@ -392,7 +392,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:99:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndDuplicateSetter = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:100:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter;
@@ -400,7 +400,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:101:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndDuplicateSetter = 0;
 }
 static method main() → dynamic {
   core::int c = 0;
diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.modular.expect
index b56fa4bffcb..8323460dd3b 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.modular.expect
@@ -332,7 +332,7 @@ Try correcting the name to the name of an existing method, or defining a method
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:84:6: Error: The getter 'instanceMethod' isn't defined for the class '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}.call();
+     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:85:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
   c.instanceGetter;
@@ -340,7 +340,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:86:5: Error: The setter 'instanceSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^" in c.{<unresolved>}instanceSetter = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:87:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
   c.instanceField;
@@ -348,7 +348,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:88:5: Error: The setter 'instanceField' isn't defined for the class '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;
+    ^^^^^^^^^^^^^" in c.{<unresolved>}instanceField = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:89:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1;
@@ -356,7 +356,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:90:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter1 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:91:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
@@ -364,7 +364,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:92:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter2 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:93:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1;
@@ -372,7 +372,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:94:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter1 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:95:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
@@ -380,7 +380,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:96:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter2 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:97:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter;
@@ -392,7 +392,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:99:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndDuplicateSetter = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:100:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter;
@@ -400,7 +400,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:101:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndDuplicateSetter = 0;
 }
 static method main() → dynamic {
   core::int c = 0;
diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.transformed.expect
index b56fa4bffcb..8323460dd3b 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.weak.transformed.expect
@@ -332,7 +332,7 @@ Try correcting the name to the name of an existing method, or defining a method
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:84:6: Error: The getter 'instanceMethod' isn't defined for the class '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}.call();
+     ^^^^^^^^^^^^^^" in c{<unresolved>}.instanceMethod{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:85:5: Error: The getter 'instanceGetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceGetter'.
   c.instanceGetter;
@@ -340,7 +340,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:86:5: Error: The setter 'instanceSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^" in c.{<unresolved>}instanceSetter = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:87:5: Error: The getter 'instanceField' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceField'.
   c.instanceField;
@@ -348,7 +348,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:88:5: Error: The setter 'instanceField' isn't defined for the class '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;
+    ^^^^^^^^^^^^^" in c.{<unresolved>}instanceField = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:89:5: Error: The getter 'instanceFieldAndSetter1' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter1'.
   c.instanceFieldAndSetter1;
@@ -356,7 +356,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:90:5: Error: The setter 'instanceFieldAndSetter1' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter1 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:91:5: Error: The getter 'instanceFieldAndSetter2' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceFieldAndSetter2'.
   c.instanceFieldAndSetter2;
@@ -364,7 +364,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:92:5: Error: The setter 'instanceFieldAndSetter2' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndSetter2 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:93:5: Error: The getter 'instanceLateFinalFieldAndSetter1' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter1'.
   c.instanceLateFinalFieldAndSetter1;
@@ -372,7 +372,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:94:5: Error: The setter 'instanceLateFinalFieldAndSetter1' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter1 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:95:5: Error: The getter 'instanceLateFinalFieldAndSetter2' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceLateFinalFieldAndSetter2'.
   c.instanceLateFinalFieldAndSetter2;
@@ -380,7 +380,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:96:5: Error: The setter 'instanceLateFinalFieldAndSetter2' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceLateFinalFieldAndSetter2 = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:97:5: Error: The getter 'instanceDuplicateFieldAndSetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndSetter'.
   c.instanceDuplicateFieldAndSetter;
@@ -392,7 +392,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:99:5: Error: The setter 'instanceFieldAndDuplicateSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceFieldAndDuplicateSetter = 0;
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:100:5: Error: The getter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class 'int'.
 Try correcting the name to the name of an existing getter, or defining a getter or field named 'instanceDuplicateFieldAndDuplicateSetter'.
   c.instanceDuplicateFieldAndDuplicateSetter;
@@ -400,7 +400,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:101:5: Error: The setter 'instanceDuplicateFieldAndDuplicateSetter' isn't defined for the class '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;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}instanceDuplicateFieldAndDuplicateSetter = 0;
 }
 static method main() → dynamic {
   core::int c = 0;
diff --git a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.expect b/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.expect
index d7ecf88cb7c..ff3b447d1d3 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.expect
@@ -221,7 +221,7 @@ static method test() → dynamic {
         ^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static.dart:86:10: Error: Can't use 'staticMethod' because it is declared more than once.
   (Class.staticMethod)();
-         ^^^^^^^^^^^^"{dynamic}.call();
+         ^^^^^^^^^^^^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static.dart:87:9: Error: Can't use 'staticGetter' because it is declared more than once.
   Class.staticGetter;
         ^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.transformed.expect
index d7ecf88cb7c..ff3b447d1d3 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.transformed.expect
@@ -221,7 +221,7 @@ static method test() → dynamic {
         ^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static.dart:86:10: Error: Can't use 'staticMethod' because it is declared more than once.
   (Class.staticMethod)();
-         ^^^^^^^^^^^^"{dynamic}.call();
+         ^^^^^^^^^^^^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static.dart:87:9: Error: Can't use 'staticGetter' because it is declared more than once.
   Class.staticGetter;
         ^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.expect b/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.expect
index d7ecf88cb7c..ff3b447d1d3 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.expect
@@ -221,7 +221,7 @@ static method test() → dynamic {
         ^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static.dart:86:10: Error: Can't use 'staticMethod' because it is declared more than once.
   (Class.staticMethod)();
-         ^^^^^^^^^^^^"{dynamic}.call();
+         ^^^^^^^^^^^^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static.dart:87:9: Error: Can't use 'staticGetter' because it is declared more than once.
   Class.staticGetter;
         ^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.modular.expect
index d7ecf88cb7c..ff3b447d1d3 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.modular.expect
@@ -221,7 +221,7 @@ static method test() → dynamic {
         ^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static.dart:86:10: Error: Can't use 'staticMethod' because it is declared more than once.
   (Class.staticMethod)();
-         ^^^^^^^^^^^^"{dynamic}.call();
+         ^^^^^^^^^^^^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static.dart:87:9: Error: Can't use 'staticGetter' because it is declared more than once.
   Class.staticGetter;
         ^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.transformed.expect
index d7ecf88cb7c..ff3b447d1d3 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_static.dart.weak.transformed.expect
@@ -221,7 +221,7 @@ static method test() → dynamic {
         ^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static.dart:86:10: Error: Can't use 'staticMethod' because it is declared more than once.
   (Class.staticMethod)();
-         ^^^^^^^^^^^^"{dynamic}.call();
+         ^^^^^^^^^^^^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static.dart:87:9: Error: Can't use 'staticGetter' because it is declared more than once.
   Class.staticGetter;
         ^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.expect b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.expect
index 79f6ac6e779..b8a96ddc5be 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.expect
@@ -238,7 +238,7 @@ static method test() → dynamic {
             ^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:86:14: Error: Can't use 'staticMethod' because it is declared more than once.
   (Extension.staticMethod)();
-             ^^^^^^^^^^^^"{dynamic}.call();
+             ^^^^^^^^^^^^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:87:13: Error: Can't use 'staticGetter' because it is declared more than once.
   Extension.staticGetter;
             ^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.transformed.expect
index 79f6ac6e779..b8a96ddc5be 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.transformed.expect
@@ -238,7 +238,7 @@ static method test() → dynamic {
             ^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:86:14: Error: Can't use 'staticMethod' because it is declared more than once.
   (Extension.staticMethod)();
-             ^^^^^^^^^^^^"{dynamic}.call();
+             ^^^^^^^^^^^^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:87:13: Error: Can't use 'staticGetter' because it is declared more than once.
   Extension.staticGetter;
             ^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.expect b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.expect
index 79f6ac6e779..b8a96ddc5be 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.expect
@@ -238,7 +238,7 @@ static method test() → dynamic {
             ^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:86:14: Error: Can't use 'staticMethod' because it is declared more than once.
   (Extension.staticMethod)();
-             ^^^^^^^^^^^^"{dynamic}.call();
+             ^^^^^^^^^^^^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:87:13: Error: Can't use 'staticGetter' because it is declared more than once.
   Extension.staticGetter;
             ^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.modular.expect
index 79f6ac6e779..b8a96ddc5be 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.modular.expect
@@ -238,7 +238,7 @@ static method test() → dynamic {
             ^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:86:14: Error: Can't use 'staticMethod' because it is declared more than once.
   (Extension.staticMethod)();
-             ^^^^^^^^^^^^"{dynamic}.call();
+             ^^^^^^^^^^^^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:87:13: Error: Can't use 'staticGetter' because it is declared more than once.
   Extension.staticGetter;
             ^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.transformed.expect
index 79f6ac6e779..b8a96ddc5be 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.weak.transformed.expect
@@ -238,7 +238,7 @@ static method test() → dynamic {
             ^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:86:14: Error: Can't use 'staticMethod' because it is declared more than once.
   (Extension.staticMethod)();
-             ^^^^^^^^^^^^"{dynamic}.call();
+             ^^^^^^^^^^^^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:87:13: Error: Can't use 'staticGetter' because it is declared more than once.
   Extension.staticGetter;
             ^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.expect b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.expect
index f97abe6fd7c..bb419cdbdc9 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.expect
@@ -269,10 +269,10 @@ static method topLevelMethodAndSetter2() → core::int
 static method test() → dynamic {
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:88:3: Error: Can't use 'topLevelMethod' because it is declared more than once.
   topLevelMethod();
-  ^"{dynamic}.call();
+  ^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:89:4: Error: Can't use 'topLevelMethod' because it is declared more than once.
   (topLevelMethod)();
-   ^"{dynamic}.call();
+   ^"{dynamic}();
   if(invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:90:7: Error: Can't use 'topLevelMethod' because it is declared more than once.
   if (topLevelMethod) {}
       ^") {
diff --git a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.transformed.expect
index f97abe6fd7c..bb419cdbdc9 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.transformed.expect
@@ -269,10 +269,10 @@ static method topLevelMethodAndSetter2() → core::int
 static method test() → dynamic {
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:88:3: Error: Can't use 'topLevelMethod' because it is declared more than once.
   topLevelMethod();
-  ^"{dynamic}.call();
+  ^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:89:4: Error: Can't use 'topLevelMethod' because it is declared more than once.
   (topLevelMethod)();
-   ^"{dynamic}.call();
+   ^"{dynamic}();
   if(invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:90:7: Error: Can't use 'topLevelMethod' because it is declared more than once.
   if (topLevelMethod) {}
       ^") {
diff --git a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.expect b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.expect
index f97abe6fd7c..bb419cdbdc9 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.expect
@@ -269,10 +269,10 @@ static method topLevelMethodAndSetter2() → core::int
 static method test() → dynamic {
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:88:3: Error: Can't use 'topLevelMethod' because it is declared more than once.
   topLevelMethod();
-  ^"{dynamic}.call();
+  ^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:89:4: Error: Can't use 'topLevelMethod' because it is declared more than once.
   (topLevelMethod)();
-   ^"{dynamic}.call();
+   ^"{dynamic}();
   if(invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:90:7: Error: Can't use 'topLevelMethod' because it is declared more than once.
   if (topLevelMethod) {}
       ^") {
diff --git a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.modular.expect
index f97abe6fd7c..bb419cdbdc9 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.modular.expect
@@ -269,10 +269,10 @@ static method topLevelMethodAndSetter2() → core::int
 static method test() → dynamic {
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:88:3: Error: Can't use 'topLevelMethod' because it is declared more than once.
   topLevelMethod();
-  ^"{dynamic}.call();
+  ^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:89:4: Error: Can't use 'topLevelMethod' because it is declared more than once.
   (topLevelMethod)();
-   ^"{dynamic}.call();
+   ^"{dynamic}();
   if(invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:90:7: Error: Can't use 'topLevelMethod' because it is declared more than once.
   if (topLevelMethod) {}
       ^") {
diff --git a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.transformed.expect
index f97abe6fd7c..bb419cdbdc9 100644
--- a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.weak.transformed.expect
@@ -269,10 +269,10 @@ static method topLevelMethodAndSetter2() → core::int
 static method test() → dynamic {
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:88:3: Error: Can't use 'topLevelMethod' because it is declared more than once.
   topLevelMethod();
-  ^"{dynamic}.call();
+  ^"{dynamic}();
   invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:89:4: Error: Can't use 'topLevelMethod' because it is declared more than once.
   (topLevelMethod)();
-   ^"{dynamic}.call();
+   ^"{dynamic}();
   if(invalid-expression "pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:90:7: Error: Can't use 'topLevelMethod' because it is declared more than once.
   if (topLevelMethod) {}
       ^") {
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 10342672828..b3ad156698c 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
@@ -1106,7 +1106,7 @@ static method test() → dynamic {
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateInstanceFieldAndStaticSetter2 = c.{self::Class::duplicateInstanceFieldAndStaticSetter2}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateInstanceFieldAndStaticSetter2 = c.{self::Class::duplicateInstanceFieldAndStaticSetter2}{core::int?};
   self::Class::staticFieldAndSetter = self::Class::staticFieldAndSetter;
   self::Class::staticFieldAndDuplicateSetter = self::Class::staticFieldAndDuplicateSetter;
   self::Class::staticLateFinalFieldAndSetter = self::Class::staticLateFinalFieldAndSetter;
@@ -1121,13 +1121,13 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.staticFieldAndInstanceSetter = self::Class::staticFieldAndInstanceSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}staticFieldAndInstanceSetter = self::Class::staticFieldAndInstanceSetter;
   self::Class::staticFieldAndInstanceSetter = self::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'.
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
   self::Class::staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:209:9: Error: Setter not found: 'instanceFieldAndStaticSetter'.
   Class.instanceFieldAndStaticSetter = c.instanceFieldAndStaticSetter;
@@ -1141,7 +1141,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:218:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter1' because it is declared more than once.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:218:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter1' because it is declared more than once.
       Class.duplicateStaticFieldAndInstanceSetter1;
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:219:48: Error: Can't assign to this.
@@ -1151,7 +1151,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:223:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter2' because it is declared more than once.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:223:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter2' because it is declared more than once.
       Class.duplicateStaticFieldAndInstanceSetter2;
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:224:48: Error: Can't assign to this.
@@ -1166,28 +1166,28 @@ 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:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class '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 class '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'.
 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 class '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'.
 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 class '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'.
 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 class '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;
@@ -1204,12 +1204,12 @@ 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:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class '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 = self::Extension|extensionStaticFieldAndInstanceSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceSetter = self::Extension|extensionStaticFieldAndInstanceSetter;
   self::Extension|extensionStaticFieldAndInstanceSetter = self::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'.
 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 = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceDuplicateSetter = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
   self::Extension|extensionStaticFieldAndInstanceDuplicateSetter = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:267:13: Error: Setter not found: 'extensionInstanceFieldAndStaticSetter'.
   Extension.extensionInstanceFieldAndStaticSetter =
@@ -1217,7 +1217,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:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class '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 class '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;
@@ -1227,7 +1227,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:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class '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 class '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;
@@ -1237,7 +1237,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:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class '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 class '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;
@@ -1247,7 +1247,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:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class '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 class '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;
@@ -1257,7 +1257,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:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class '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.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" 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.
       Extension.duplicateExtensionStaticFieldAndInstanceSetter1;
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:292:61: Error: Can't assign to this.
@@ -1266,7 +1266,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:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class '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.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" 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.
       Extension.duplicateExtensionStaticFieldAndInstanceSetter2;
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
 }
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 10342672828..b3ad156698c 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
@@ -1106,7 +1106,7 @@ static method test() → dynamic {
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateInstanceFieldAndStaticSetter2 = c.{self::Class::duplicateInstanceFieldAndStaticSetter2}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateInstanceFieldAndStaticSetter2 = c.{self::Class::duplicateInstanceFieldAndStaticSetter2}{core::int?};
   self::Class::staticFieldAndSetter = self::Class::staticFieldAndSetter;
   self::Class::staticFieldAndDuplicateSetter = self::Class::staticFieldAndDuplicateSetter;
   self::Class::staticLateFinalFieldAndSetter = self::Class::staticLateFinalFieldAndSetter;
@@ -1121,13 +1121,13 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.staticFieldAndInstanceSetter = self::Class::staticFieldAndInstanceSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}staticFieldAndInstanceSetter = self::Class::staticFieldAndInstanceSetter;
   self::Class::staticFieldAndInstanceSetter = self::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'.
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
   self::Class::staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:209:9: Error: Setter not found: 'instanceFieldAndStaticSetter'.
   Class.instanceFieldAndStaticSetter = c.instanceFieldAndStaticSetter;
@@ -1141,7 +1141,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:218:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter1' because it is declared more than once.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:218:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter1' because it is declared more than once.
       Class.duplicateStaticFieldAndInstanceSetter1;
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:219:48: Error: Can't assign to this.
@@ -1151,7 +1151,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:223:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter2' because it is declared more than once.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:223:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter2' because it is declared more than once.
       Class.duplicateStaticFieldAndInstanceSetter2;
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:224:48: Error: Can't assign to this.
@@ -1166,28 +1166,28 @@ 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:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class '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 class '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'.
 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 class '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'.
 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 class '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'.
 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 class '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;
@@ -1204,12 +1204,12 @@ 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:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class '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 = self::Extension|extensionStaticFieldAndInstanceSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceSetter = self::Extension|extensionStaticFieldAndInstanceSetter;
   self::Extension|extensionStaticFieldAndInstanceSetter = self::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'.
 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 = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceDuplicateSetter = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
   self::Extension|extensionStaticFieldAndInstanceDuplicateSetter = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:267:13: Error: Setter not found: 'extensionInstanceFieldAndStaticSetter'.
   Extension.extensionInstanceFieldAndStaticSetter =
@@ -1217,7 +1217,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:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class '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 class '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;
@@ -1227,7 +1227,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:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class '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 class '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;
@@ -1237,7 +1237,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:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class '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 class '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;
@@ -1247,7 +1247,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:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class '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 class '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;
@@ -1257,7 +1257,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:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class '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.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" 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.
       Extension.duplicateExtensionStaticFieldAndInstanceSetter1;
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:292:61: Error: Can't assign to this.
@@ -1266,7 +1266,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:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class '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.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" 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.
       Extension.duplicateExtensionStaticFieldAndInstanceSetter2;
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
 }
diff --git a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.expect b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.expect
index 10342672828..b3ad156698c 100644
--- a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.expect
@@ -1106,7 +1106,7 @@ static method test() → dynamic {
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateInstanceFieldAndStaticSetter2 = c.{self::Class::duplicateInstanceFieldAndStaticSetter2}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateInstanceFieldAndStaticSetter2 = c.{self::Class::duplicateInstanceFieldAndStaticSetter2}{core::int?};
   self::Class::staticFieldAndSetter = self::Class::staticFieldAndSetter;
   self::Class::staticFieldAndDuplicateSetter = self::Class::staticFieldAndDuplicateSetter;
   self::Class::staticLateFinalFieldAndSetter = self::Class::staticLateFinalFieldAndSetter;
@@ -1121,13 +1121,13 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.staticFieldAndInstanceSetter = self::Class::staticFieldAndInstanceSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}staticFieldAndInstanceSetter = self::Class::staticFieldAndInstanceSetter;
   self::Class::staticFieldAndInstanceSetter = self::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'.
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
   self::Class::staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:209:9: Error: Setter not found: 'instanceFieldAndStaticSetter'.
   Class.instanceFieldAndStaticSetter = c.instanceFieldAndStaticSetter;
@@ -1141,7 +1141,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:218:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter1' because it is declared more than once.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:218:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter1' because it is declared more than once.
       Class.duplicateStaticFieldAndInstanceSetter1;
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:219:48: Error: Can't assign to this.
@@ -1151,7 +1151,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:223:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter2' because it is declared more than once.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:223:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter2' because it is declared more than once.
       Class.duplicateStaticFieldAndInstanceSetter2;
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:224:48: Error: Can't assign to this.
@@ -1166,28 +1166,28 @@ 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:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class '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 class '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'.
 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 class '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'.
 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 class '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'.
 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 class '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;
@@ -1204,12 +1204,12 @@ 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:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class '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 = self::Extension|extensionStaticFieldAndInstanceSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceSetter = self::Extension|extensionStaticFieldAndInstanceSetter;
   self::Extension|extensionStaticFieldAndInstanceSetter = self::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'.
 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 = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceDuplicateSetter = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
   self::Extension|extensionStaticFieldAndInstanceDuplicateSetter = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:267:13: Error: Setter not found: 'extensionInstanceFieldAndStaticSetter'.
   Extension.extensionInstanceFieldAndStaticSetter =
@@ -1217,7 +1217,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:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class '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 class '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;
@@ -1227,7 +1227,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:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class '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 class '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;
@@ -1237,7 +1237,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:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class '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 class '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;
@@ -1247,7 +1247,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:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class '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 class '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;
@@ -1257,7 +1257,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:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class '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.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" 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.
       Extension.duplicateExtensionStaticFieldAndInstanceSetter1;
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:292:61: Error: Can't assign to this.
@@ -1266,7 +1266,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:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class '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.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" 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.
       Extension.duplicateExtensionStaticFieldAndInstanceSetter2;
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
 }
diff --git a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.modular.expect
index 10342672828..b3ad156698c 100644
--- a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.modular.expect
@@ -1106,7 +1106,7 @@ static method test() → dynamic {
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateInstanceFieldAndStaticSetter2 = c.{self::Class::duplicateInstanceFieldAndStaticSetter2}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateInstanceFieldAndStaticSetter2 = c.{self::Class::duplicateInstanceFieldAndStaticSetter2}{core::int?};
   self::Class::staticFieldAndSetter = self::Class::staticFieldAndSetter;
   self::Class::staticFieldAndDuplicateSetter = self::Class::staticFieldAndDuplicateSetter;
   self::Class::staticLateFinalFieldAndSetter = self::Class::staticLateFinalFieldAndSetter;
@@ -1121,13 +1121,13 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.staticFieldAndInstanceSetter = self::Class::staticFieldAndInstanceSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}staticFieldAndInstanceSetter = self::Class::staticFieldAndInstanceSetter;
   self::Class::staticFieldAndInstanceSetter = self::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'.
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
   self::Class::staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:209:9: Error: Setter not found: 'instanceFieldAndStaticSetter'.
   Class.instanceFieldAndStaticSetter = c.instanceFieldAndStaticSetter;
@@ -1141,7 +1141,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:218:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter1' because it is declared more than once.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:218:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter1' because it is declared more than once.
       Class.duplicateStaticFieldAndInstanceSetter1;
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:219:48: Error: Can't assign to this.
@@ -1151,7 +1151,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:223:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter2' because it is declared more than once.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:223:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter2' because it is declared more than once.
       Class.duplicateStaticFieldAndInstanceSetter2;
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:224:48: Error: Can't assign to this.
@@ -1166,28 +1166,28 @@ 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:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class '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 class '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'.
 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 class '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'.
 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 class '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'.
 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 class '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;
@@ -1204,12 +1204,12 @@ 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:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class '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 = self::Extension|extensionStaticFieldAndInstanceSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceSetter = self::Extension|extensionStaticFieldAndInstanceSetter;
   self::Extension|extensionStaticFieldAndInstanceSetter = self::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'.
 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 = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceDuplicateSetter = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
   self::Extension|extensionStaticFieldAndInstanceDuplicateSetter = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:267:13: Error: Setter not found: 'extensionInstanceFieldAndStaticSetter'.
   Extension.extensionInstanceFieldAndStaticSetter =
@@ -1217,7 +1217,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:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class '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 class '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;
@@ -1227,7 +1227,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:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class '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 class '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;
@@ -1237,7 +1237,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:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class '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 class '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;
@@ -1247,7 +1247,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:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class '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 class '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;
@@ -1257,7 +1257,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:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class '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.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" 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.
       Extension.duplicateExtensionStaticFieldAndInstanceSetter1;
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:292:61: Error: Can't assign to this.
@@ -1266,7 +1266,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:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class '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.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" 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.
       Extension.duplicateExtensionStaticFieldAndInstanceSetter2;
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
 }
diff --git a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.transformed.expect
index 10342672828..b3ad156698c 100644
--- a/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/field_vs_setter.dart.weak.transformed.expect
@@ -1106,7 +1106,7 @@ static method test() → dynamic {
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateInstanceFieldAndStaticSetter2 = c.{self::Class::duplicateInstanceFieldAndStaticSetter2}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateInstanceFieldAndStaticSetter2 = c.{self::Class::duplicateInstanceFieldAndStaticSetter2}{core::int?};
   self::Class::staticFieldAndSetter = self::Class::staticFieldAndSetter;
   self::Class::staticFieldAndDuplicateSetter = self::Class::staticFieldAndDuplicateSetter;
   self::Class::staticLateFinalFieldAndSetter = self::Class::staticLateFinalFieldAndSetter;
@@ -1121,13 +1121,13 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.staticFieldAndInstanceSetter = self::Class::staticFieldAndInstanceSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}staticFieldAndInstanceSetter = self::Class::staticFieldAndInstanceSetter;
   self::Class::staticFieldAndInstanceSetter = self::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'.
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
   self::Class::staticFieldAndInstanceDuplicateSetter = self::Class::staticFieldAndInstanceDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:209:9: Error: Setter not found: 'instanceFieldAndStaticSetter'.
   Class.instanceFieldAndStaticSetter = c.instanceFieldAndStaticSetter;
@@ -1141,7 +1141,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:218:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter1' because it is declared more than once.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateStaticFieldAndInstanceSetter1 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:218:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter1' because it is declared more than once.
       Class.duplicateStaticFieldAndInstanceSetter1;
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:219:48: Error: Can't assign to this.
@@ -1151,7 +1151,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 =
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.duplicateStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:223:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter2' because it is declared more than once.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}duplicateStaticFieldAndInstanceSetter2 = invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:223:13: Error: Can't use 'duplicateStaticFieldAndInstanceSetter2' because it is declared more than once.
       Class.duplicateStaticFieldAndInstanceSetter2;
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:224:48: Error: Can't assign to this.
@@ -1166,28 +1166,28 @@ 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:232:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class '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 class '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'.
 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 class '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'.
 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 class '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'.
 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 class '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;
@@ -1204,12 +1204,12 @@ 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:257:5: Error: The setter 'extensionStaticFieldAndInstanceSetter' isn't defined for the class '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 = self::Extension|extensionStaticFieldAndInstanceSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceSetter = self::Extension|extensionStaticFieldAndInstanceSetter;
   self::Extension|extensionStaticFieldAndInstanceSetter = self::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'.
 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 = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionStaticFieldAndInstanceDuplicateSetter = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
   self::Extension|extensionStaticFieldAndInstanceDuplicateSetter = self::Extension|extensionStaticFieldAndInstanceDuplicateSetter;
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:267:13: Error: Setter not found: 'extensionInstanceFieldAndStaticSetter'.
   Extension.extensionInstanceFieldAndStaticSetter =
@@ -1217,7 +1217,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:269:5: Error: The setter 'extensionInstanceFieldAndStaticSetter' isn't defined for the class '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 class '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;
@@ -1227,7 +1227,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:274:5: Error: The setter 'extensionInstanceFieldAndStaticDuplicateSetter' isn't defined for the class '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 class '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;
@@ -1237,7 +1237,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:279:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter1' isn't defined for the class '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 class '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;
@@ -1247,7 +1247,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:284:5: Error: The setter 'duplicateExtensionInstanceFieldAndStaticSetter2' isn't defined for the class '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 class '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;
@@ -1257,7 +1257,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:289:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter1' isn't defined for the class '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.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" 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.
       Extension.duplicateExtensionStaticFieldAndInstanceSetter1;
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
   invalid-expression "pkg/front_end/testcases/nnbd/field_vs_setter.dart:292:61: Error: Can't assign to this.
@@ -1266,7 +1266,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:294:5: Error: The setter 'duplicateExtensionStaticFieldAndInstanceSetter2' isn't defined for the class '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.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" 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.
       Extension.duplicateExtensionStaticFieldAndInstanceSetter2;
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
 }
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 8cad57ba996..7095266c759 100644
--- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.expect
@@ -317,7 +317,7 @@ static method test(self::Class c) → dynamic {
  - '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;
-    ^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndField1 = c.{self::Class::methodAndField1}{() → core::int?};
+    ^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndField1 = c.{self::Class::methodAndField1}{() → core::int?};
   c.{self::Class::methodAndField2} = c.{self::Class::methodAndField2}{core::int?};
   c.{self::Class::methodAndFinalField1}{() → core::int?};
   c.{self::Class::methodAndFinalField2}{core::int?};
@@ -325,13 +325,13 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter1 = c.{self::Class::methodAndFieldAndSetter1}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter2} = c.{self::Class::methodAndFieldAndSetter2}{core::int?};
   invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:5: Error: The setter 'methodAndFieldAndSetter3' isn't defined for the class '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 'methodAndFieldAndSetter3'.
   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
-    ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter3 = c.{self::Class::methodAndFieldAndSetter3}{() → core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter3 = c.{self::Class::methodAndFieldAndSetter3}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter4} = c.{self::Class::methodAndFieldAndSetter4}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter1} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:39: Error: A value of type 'int? Function()' can't be assigned to a variable of type 'int?'.
   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
@@ -352,12 +352,12 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 'fieldAndFinalFieldAndSetter2'.
   c.fieldAndFinalFieldAndSetter2 = c.fieldAndFinalFieldAndSetter2;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.fieldAndFinalFieldAndSetter2 = c.{self::Class::fieldAndFinalFieldAndSetter2}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}fieldAndFinalFieldAndSetter2 = c.{self::Class::fieldAndFinalFieldAndSetter2}{core::int?};
   c.{self::Class::fieldAndFinalFieldAndSetter3} = c.{self::Class::fieldAndFinalFieldAndSetter3}{core::int?};
   invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:99:5: Error: The setter 'fieldAndFinalFieldAndSetter4' isn't defined for the class '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 'fieldAndFinalFieldAndSetter4'.
   c.fieldAndFinalFieldAndSetter4 = c.fieldAndFinalFieldAndSetter4;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.fieldAndFinalFieldAndSetter4 = c.{self::Class::fieldAndFinalFieldAndSetter4}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}fieldAndFinalFieldAndSetter4 = c.{self::Class::fieldAndFinalFieldAndSetter4}{core::int?};
 }
 static method main() → dynamic {}
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 8cad57ba996..7095266c759 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
@@ -317,7 +317,7 @@ static method test(self::Class c) → dynamic {
  - '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;
-    ^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndField1 = c.{self::Class::methodAndField1}{() → core::int?};
+    ^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndField1 = c.{self::Class::methodAndField1}{() → core::int?};
   c.{self::Class::methodAndField2} = c.{self::Class::methodAndField2}{core::int?};
   c.{self::Class::methodAndFinalField1}{() → core::int?};
   c.{self::Class::methodAndFinalField2}{core::int?};
@@ -325,13 +325,13 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter1 = c.{self::Class::methodAndFieldAndSetter1}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter2} = c.{self::Class::methodAndFieldAndSetter2}{core::int?};
   invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:5: Error: The setter 'methodAndFieldAndSetter3' isn't defined for the class '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 'methodAndFieldAndSetter3'.
   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
-    ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter3 = c.{self::Class::methodAndFieldAndSetter3}{() → core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter3 = c.{self::Class::methodAndFieldAndSetter3}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter4} = c.{self::Class::methodAndFieldAndSetter4}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter1} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:39: Error: A value of type 'int? Function()' can't be assigned to a variable of type 'int?'.
   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
@@ -352,12 +352,12 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 'fieldAndFinalFieldAndSetter2'.
   c.fieldAndFinalFieldAndSetter2 = c.fieldAndFinalFieldAndSetter2;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.fieldAndFinalFieldAndSetter2 = c.{self::Class::fieldAndFinalFieldAndSetter2}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}fieldAndFinalFieldAndSetter2 = c.{self::Class::fieldAndFinalFieldAndSetter2}{core::int?};
   c.{self::Class::fieldAndFinalFieldAndSetter3} = c.{self::Class::fieldAndFinalFieldAndSetter3}{core::int?};
   invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:99:5: Error: The setter 'fieldAndFinalFieldAndSetter4' isn't defined for the class '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 'fieldAndFinalFieldAndSetter4'.
   c.fieldAndFinalFieldAndSetter4 = c.fieldAndFinalFieldAndSetter4;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.fieldAndFinalFieldAndSetter4 = c.{self::Class::fieldAndFinalFieldAndSetter4}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}fieldAndFinalFieldAndSetter4 = c.{self::Class::fieldAndFinalFieldAndSetter4}{core::int?};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.expect b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.expect
index 8cad57ba996..7095266c759 100644
--- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.expect
@@ -317,7 +317,7 @@ static method test(self::Class c) → dynamic {
  - '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;
-    ^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndField1 = c.{self::Class::methodAndField1}{() → core::int?};
+    ^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndField1 = c.{self::Class::methodAndField1}{() → core::int?};
   c.{self::Class::methodAndField2} = c.{self::Class::methodAndField2}{core::int?};
   c.{self::Class::methodAndFinalField1}{() → core::int?};
   c.{self::Class::methodAndFinalField2}{core::int?};
@@ -325,13 +325,13 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter1 = c.{self::Class::methodAndFieldAndSetter1}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter2} = c.{self::Class::methodAndFieldAndSetter2}{core::int?};
   invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:5: Error: The setter 'methodAndFieldAndSetter3' isn't defined for the class '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 'methodAndFieldAndSetter3'.
   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
-    ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter3 = c.{self::Class::methodAndFieldAndSetter3}{() → core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter3 = c.{self::Class::methodAndFieldAndSetter3}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter4} = c.{self::Class::methodAndFieldAndSetter4}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter1} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:39: Error: A value of type 'int? Function()' can't be assigned to a variable of type 'int?'.
   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
@@ -352,12 +352,12 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 'fieldAndFinalFieldAndSetter2'.
   c.fieldAndFinalFieldAndSetter2 = c.fieldAndFinalFieldAndSetter2;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.fieldAndFinalFieldAndSetter2 = c.{self::Class::fieldAndFinalFieldAndSetter2}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}fieldAndFinalFieldAndSetter2 = c.{self::Class::fieldAndFinalFieldAndSetter2}{core::int?};
   c.{self::Class::fieldAndFinalFieldAndSetter3} = c.{self::Class::fieldAndFinalFieldAndSetter3}{core::int?};
   invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:99:5: Error: The setter 'fieldAndFinalFieldAndSetter4' isn't defined for the class '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 'fieldAndFinalFieldAndSetter4'.
   c.fieldAndFinalFieldAndSetter4 = c.fieldAndFinalFieldAndSetter4;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.fieldAndFinalFieldAndSetter4 = c.{self::Class::fieldAndFinalFieldAndSetter4}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}fieldAndFinalFieldAndSetter4 = c.{self::Class::fieldAndFinalFieldAndSetter4}{core::int?};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.modular.expect
index 8cad57ba996..7095266c759 100644
--- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.modular.expect
@@ -317,7 +317,7 @@ static method test(self::Class c) → dynamic {
  - '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;
-    ^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndField1 = c.{self::Class::methodAndField1}{() → core::int?};
+    ^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndField1 = c.{self::Class::methodAndField1}{() → core::int?};
   c.{self::Class::methodAndField2} = c.{self::Class::methodAndField2}{core::int?};
   c.{self::Class::methodAndFinalField1}{() → core::int?};
   c.{self::Class::methodAndFinalField2}{core::int?};
@@ -325,13 +325,13 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter1 = c.{self::Class::methodAndFieldAndSetter1}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter2} = c.{self::Class::methodAndFieldAndSetter2}{core::int?};
   invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:5: Error: The setter 'methodAndFieldAndSetter3' isn't defined for the class '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 'methodAndFieldAndSetter3'.
   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
-    ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter3 = c.{self::Class::methodAndFieldAndSetter3}{() → core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter3 = c.{self::Class::methodAndFieldAndSetter3}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter4} = c.{self::Class::methodAndFieldAndSetter4}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter1} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:39: Error: A value of type 'int? Function()' can't be assigned to a variable of type 'int?'.
   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
@@ -352,12 +352,12 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 'fieldAndFinalFieldAndSetter2'.
   c.fieldAndFinalFieldAndSetter2 = c.fieldAndFinalFieldAndSetter2;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.fieldAndFinalFieldAndSetter2 = c.{self::Class::fieldAndFinalFieldAndSetter2}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}fieldAndFinalFieldAndSetter2 = c.{self::Class::fieldAndFinalFieldAndSetter2}{core::int?};
   c.{self::Class::fieldAndFinalFieldAndSetter3} = c.{self::Class::fieldAndFinalFieldAndSetter3}{core::int?};
   invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:99:5: Error: The setter 'fieldAndFinalFieldAndSetter4' isn't defined for the class '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 'fieldAndFinalFieldAndSetter4'.
   c.fieldAndFinalFieldAndSetter4 = c.fieldAndFinalFieldAndSetter4;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.fieldAndFinalFieldAndSetter4 = c.{self::Class::fieldAndFinalFieldAndSetter4}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}fieldAndFinalFieldAndSetter4 = c.{self::Class::fieldAndFinalFieldAndSetter4}{core::int?};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.transformed.expect
index 8cad57ba996..7095266c759 100644
--- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.weak.transformed.expect
@@ -317,7 +317,7 @@ static method test(self::Class c) → dynamic {
  - '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;
-    ^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndField1 = c.{self::Class::methodAndField1}{() → core::int?};
+    ^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndField1 = c.{self::Class::methodAndField1}{() → core::int?};
   c.{self::Class::methodAndField2} = c.{self::Class::methodAndField2}{core::int?};
   c.{self::Class::methodAndFinalField1}{() → core::int?};
   c.{self::Class::methodAndFinalField2}{core::int?};
@@ -325,13 +325,13 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter1 = c.{self::Class::methodAndFieldAndSetter1}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter2} = c.{self::Class::methodAndFieldAndSetter2}{core::int?};
   invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:86:5: Error: The setter 'methodAndFieldAndSetter3' isn't defined for the class '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 'methodAndFieldAndSetter3'.
   c.methodAndFieldAndSetter3 = c.methodAndFieldAndSetter3;
-    ^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.methodAndFieldAndSetter3 = c.{self::Class::methodAndFieldAndSetter3}{() → core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}methodAndFieldAndSetter3 = c.{self::Class::methodAndFieldAndSetter3}{() → core::int?};
   c.{self::Class::methodAndFieldAndSetter4} = c.{self::Class::methodAndFieldAndSetter4}{core::int?};
   c.{self::Class::methodAndFinalFieldAndSetter1} = invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:88:39: Error: A value of type 'int? Function()' can't be assigned to a variable of type 'int?'.
   c.methodAndFinalFieldAndSetter1 = c.methodAndFinalFieldAndSetter1;
@@ -352,12 +352,12 @@ Try correcting the name to the name of an existing setter, or defining a setter
  - '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 'fieldAndFinalFieldAndSetter2'.
   c.fieldAndFinalFieldAndSetter2 = c.fieldAndFinalFieldAndSetter2;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.fieldAndFinalFieldAndSetter2 = c.{self::Class::fieldAndFinalFieldAndSetter2}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}fieldAndFinalFieldAndSetter2 = c.{self::Class::fieldAndFinalFieldAndSetter2}{core::int?};
   c.{self::Class::fieldAndFinalFieldAndSetter3} = c.{self::Class::fieldAndFinalFieldAndSetter3}{core::int?};
   invalid-expression "pkg/front_end/testcases/nnbd/instance_duplicates.dart:99:5: Error: The setter 'fieldAndFinalFieldAndSetter4' isn't defined for the class '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 'fieldAndFinalFieldAndSetter4'.
   c.fieldAndFinalFieldAndSetter4 = c.fieldAndFinalFieldAndSetter4;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.fieldAndFinalFieldAndSetter4 = c.{self::Class::fieldAndFinalFieldAndSetter4}{core::int?};
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}fieldAndFinalFieldAndSetter4 = c.{self::Class::fieldAndFinalFieldAndSetter4}{core::int?};
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/nnbd/issue41273.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue41273.dart.strong.expect
index 059a3b9b322..ee8dd1d2fdb 100644
--- a/pkg/front_end/testcases/nnbd/issue41273.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/issue41273.dart.strong.expect
@@ -12,8 +12,8 @@ static method test(Never x) → void {
   Never n7 = x{Never}.call();
   Never n8 = x{Never}.runtimeType();
   Never n9 = x{Never}.toString;
-  x{Never}.runtimeType = #C1;
-  x{Never}.toString = () → core::String => "";
+  x.{Never}runtimeType = #C1;
+  x.{Never}toString = () → core::String => "";
   Never v1 = x{Never}.toString();
   Never v2 = x{Never}.runtimeType;
   Never v3 = x{Never}.someGetter;
diff --git a/pkg/front_end/testcases/nnbd/issue41273.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue41273.dart.strong.transformed.expect
index 059a3b9b322..ee8dd1d2fdb 100644
--- a/pkg/front_end/testcases/nnbd/issue41273.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/issue41273.dart.strong.transformed.expect
@@ -12,8 +12,8 @@ static method test(Never x) → void {
   Never n7 = x{Never}.call();
   Never n8 = x{Never}.runtimeType();
   Never n9 = x{Never}.toString;
-  x{Never}.runtimeType = #C1;
-  x{Never}.toString = () → core::String => "";
+  x.{Never}runtimeType = #C1;
+  x.{Never}toString = () → core::String => "";
   Never v1 = x{Never}.toString();
   Never v2 = x{Never}.runtimeType;
   Never v3 = x{Never}.someGetter;
diff --git a/pkg/front_end/testcases/nnbd/issue41273.dart.weak.expect b/pkg/front_end/testcases/nnbd/issue41273.dart.weak.expect
index 63968f16fa0..ae1a08ede25 100644
--- a/pkg/front_end/testcases/nnbd/issue41273.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/issue41273.dart.weak.expect
@@ -13,8 +13,8 @@ static method test(Never x) → void {
   Never n7 = let final Never #t15 = (let final Never #t16 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.call() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never n8 = let final Never #t17 = (let final Never #t18 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.runtimeType() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never n9 = let final Never #t19 = (let final Never #t20 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.toString in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  (let final Never #t21 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.runtimeType = #C1;
-  (let final Never #t22 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.toString = () → core::String => "";
+  (let final Never #t21 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}runtimeType = #C1;
+  (let final Never #t22 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}toString = () → core::String => "";
   Never v1 = let final Never #t23 = (let final Never #t24 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.toString() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never v2 = let final Never #t25 = (let final Never #t26 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.runtimeType in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never v3 = let final Never #t27 = (let final Never #t28 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.someGetter in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
diff --git a/pkg/front_end/testcases/nnbd/issue41273.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/issue41273.dart.weak.modular.expect
index 63968f16fa0..ae1a08ede25 100644
--- a/pkg/front_end/testcases/nnbd/issue41273.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/issue41273.dart.weak.modular.expect
@@ -13,8 +13,8 @@ static method test(Never x) → void {
   Never n7 = let final Never #t15 = (let final Never #t16 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.call() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never n8 = let final Never #t17 = (let final Never #t18 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.runtimeType() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never n9 = let final Never #t19 = (let final Never #t20 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.toString in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  (let final Never #t21 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.runtimeType = #C1;
-  (let final Never #t22 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.toString = () → core::String => "";
+  (let final Never #t21 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}runtimeType = #C1;
+  (let final Never #t22 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}toString = () → core::String => "";
   Never v1 = let final Never #t23 = (let final Never #t24 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.toString() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never v2 = let final Never #t25 = (let final Never #t26 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.runtimeType in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never v3 = let final Never #t27 = (let final Never #t28 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.someGetter in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
diff --git a/pkg/front_end/testcases/nnbd/issue41273.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/issue41273.dart.weak.transformed.expect
index 63968f16fa0..ae1a08ede25 100644
--- a/pkg/front_end/testcases/nnbd/issue41273.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/issue41273.dart.weak.transformed.expect
@@ -13,8 +13,8 @@ static method test(Never x) → void {
   Never n7 = let final Never #t15 = (let final Never #t16 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.call() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never n8 = let final Never #t17 = (let final Never #t18 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.runtimeType() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never n9 = let final Never #t19 = (let final Never #t20 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.toString in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  (let final Never #t21 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.runtimeType = #C1;
-  (let final Never #t22 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.toString = () → core::String => "";
+  (let final Never #t21 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}runtimeType = #C1;
+  (let final Never #t22 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}toString = () → core::String => "";
   Never v1 = let final Never #t23 = (let final Never #t24 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.toString() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never v2 = let final Never #t25 = (let final Never #t26 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.runtimeType in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   Never v3 = let final Never #t27 = (let final Never #t28 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.someGetter in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
diff --git a/pkg/front_end/testcases/nnbd/issue43278.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue43278.dart.strong.expect
index f8a9d275325..99727dc57e9 100644
--- a/pkg/front_end/testcases/nnbd/issue43278.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/issue43278.dart.strong.expect
@@ -61,7 +61,7 @@ Try accessing using ?. instead.
 Try accessing using ?. instead.
   t.foo ??= x; // Error.
     ^^^" in #t2.{self::A::foo}{<nullable>}. = x : null;
-  let final dynamic #t3 = d in #t3{dynamic}.foo == null ?{dynamic} #t3{dynamic}.foo = x : null;
+  let final dynamic #t3 = d in #t3{dynamic}.foo == null ?{dynamic} #t3.{dynamic}foo = x : null;
   let final self::A? #t4 = a in #t4 == null ?{core::int?} null : let final self::A #t5 = #t4{self::A}.{self::A::bar}{self::A} in #t5.{self::A::foo}{core::int?} == null ?{core::int} #t5.{self::A::foo} = x : null;
 }
 static extension-member method Extension|get#fooExtension(lowered final self::B #this) → core::int?
diff --git a/pkg/front_end/testcases/nnbd/issue43278.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue43278.dart.strong.transformed.expect
index f8a9d275325..99727dc57e9 100644
--- a/pkg/front_end/testcases/nnbd/issue43278.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/issue43278.dart.strong.transformed.expect
@@ -61,7 +61,7 @@ Try accessing using ?. instead.
 Try accessing using ?. instead.
   t.foo ??= x; // Error.
     ^^^" in #t2.{self::A::foo}{<nullable>}. = x : null;
-  let final dynamic #t3 = d in #t3{dynamic}.foo == null ?{dynamic} #t3{dynamic}.foo = x : null;
+  let final dynamic #t3 = d in #t3{dynamic}.foo == null ?{dynamic} #t3.{dynamic}foo = x : null;
   let final self::A? #t4 = a in #t4 == null ?{core::int?} null : let final self::A #t5 = #t4{self::A}.{self::A::bar}{self::A} in #t5.{self::A::foo}{core::int?} == null ?{core::int} #t5.{self::A::foo} = x : null;
 }
 static extension-member method Extension|get#fooExtension(lowered final self::B #this) → core::int?
diff --git a/pkg/front_end/testcases/nnbd/issue43278.dart.weak.expect b/pkg/front_end/testcases/nnbd/issue43278.dart.weak.expect
index f8a9d275325..99727dc57e9 100644
--- a/pkg/front_end/testcases/nnbd/issue43278.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/issue43278.dart.weak.expect
@@ -61,7 +61,7 @@ Try accessing using ?. instead.
 Try accessing using ?. instead.
   t.foo ??= x; // Error.
     ^^^" in #t2.{self::A::foo}{<nullable>}. = x : null;
-  let final dynamic #t3 = d in #t3{dynamic}.foo == null ?{dynamic} #t3{dynamic}.foo = x : null;
+  let final dynamic #t3 = d in #t3{dynamic}.foo == null ?{dynamic} #t3.{dynamic}foo = x : null;
   let final self::A? #t4 = a in #t4 == null ?{core::int?} null : let final self::A #t5 = #t4{self::A}.{self::A::bar}{self::A} in #t5.{self::A::foo}{core::int?} == null ?{core::int} #t5.{self::A::foo} = x : null;
 }
 static extension-member method Extension|get#fooExtension(lowered final self::B #this) → core::int?
diff --git a/pkg/front_end/testcases/nnbd/issue43278.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/issue43278.dart.weak.modular.expect
index f8a9d275325..99727dc57e9 100644
--- a/pkg/front_end/testcases/nnbd/issue43278.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/issue43278.dart.weak.modular.expect
@@ -61,7 +61,7 @@ Try accessing using ?. instead.
 Try accessing using ?. instead.
   t.foo ??= x; // Error.
     ^^^" in #t2.{self::A::foo}{<nullable>}. = x : null;
-  let final dynamic #t3 = d in #t3{dynamic}.foo == null ?{dynamic} #t3{dynamic}.foo = x : null;
+  let final dynamic #t3 = d in #t3{dynamic}.foo == null ?{dynamic} #t3.{dynamic}foo = x : null;
   let final self::A? #t4 = a in #t4 == null ?{core::int?} null : let final self::A #t5 = #t4{self::A}.{self::A::bar}{self::A} in #t5.{self::A::foo}{core::int?} == null ?{core::int} #t5.{self::A::foo} = x : null;
 }
 static extension-member method Extension|get#fooExtension(lowered final self::B #this) → core::int?
diff --git a/pkg/front_end/testcases/nnbd/issue43278.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/issue43278.dart.weak.transformed.expect
index f8a9d275325..99727dc57e9 100644
--- a/pkg/front_end/testcases/nnbd/issue43278.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/issue43278.dart.weak.transformed.expect
@@ -61,7 +61,7 @@ Try accessing using ?. instead.
 Try accessing using ?. instead.
   t.foo ??= x; // Error.
     ^^^" in #t2.{self::A::foo}{<nullable>}. = x : null;
-  let final dynamic #t3 = d in #t3{dynamic}.foo == null ?{dynamic} #t3{dynamic}.foo = x : null;
+  let final dynamic #t3 = d in #t3{dynamic}.foo == null ?{dynamic} #t3.{dynamic}foo = x : null;
   let final self::A? #t4 = a in #t4 == null ?{core::int?} null : let final self::A #t5 = #t4{self::A}.{self::A::bar}{self::A} in #t5.{self::A::foo}{core::int?} == null ?{core::int} #t5.{self::A::foo} = x : null;
 }
 static extension-member method Extension|get#fooExtension(lowered final self::B #this) → core::int?
diff --git a/pkg/front_end/testcases/nnbd/late.dart.strong.expect b/pkg/front_end/testcases/nnbd/late.dart.strong.expect
index d63a27530bf..5ae8065b0c5 100644
--- a/pkg/front_end/testcases/nnbd/late.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/late.dart.strong.expect
@@ -67,7 +67,7 @@ class Class extends core::Object {
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in this{<unresolved>}.lateFinalInstanceFieldWithInit = 0;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in this.{<unresolved>}lateFinalInstanceFieldWithInit = 0;
     invalid-expression "pkg/front_end/testcases/nnbd/late.dart:44:5: Error: Setter not found: 'lateFinalStaticFieldWithInit'.
     lateFinalStaticFieldWithInit = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
@@ -97,7 +97,7 @@ static method errors() → dynamic {
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.lateFinalInstanceFieldWithInit = 0;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}lateFinalInstanceFieldWithInit = 0;
   c.{self::Class::methodWithErrors}(){() → dynamic};
   invalid-expression "pkg/front_end/testcases/nnbd/late.dart:67:9: Error: Setter not found: 'lateFinalStaticFieldWithInit'.
   Class.lateFinalStaticFieldWithInit = 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 d63a27530bf..5ae8065b0c5 100644
--- a/pkg/front_end/testcases/nnbd/late.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/late.dart.strong.transformed.expect
@@ -67,7 +67,7 @@ class Class extends core::Object {
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in this{<unresolved>}.lateFinalInstanceFieldWithInit = 0;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in this.{<unresolved>}lateFinalInstanceFieldWithInit = 0;
     invalid-expression "pkg/front_end/testcases/nnbd/late.dart:44:5: Error: Setter not found: 'lateFinalStaticFieldWithInit'.
     lateFinalStaticFieldWithInit = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
@@ -97,7 +97,7 @@ static method errors() → dynamic {
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.lateFinalInstanceFieldWithInit = 0;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}lateFinalInstanceFieldWithInit = 0;
   c.{self::Class::methodWithErrors}(){() → dynamic};
   invalid-expression "pkg/front_end/testcases/nnbd/late.dart:67:9: Error: Setter not found: 'lateFinalStaticFieldWithInit'.
   Class.lateFinalStaticFieldWithInit = 0;
diff --git a/pkg/front_end/testcases/nnbd/late.dart.weak.expect b/pkg/front_end/testcases/nnbd/late.dart.weak.expect
index d63a27530bf..5ae8065b0c5 100644
--- a/pkg/front_end/testcases/nnbd/late.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/late.dart.weak.expect
@@ -67,7 +67,7 @@ class Class extends core::Object {
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in this{<unresolved>}.lateFinalInstanceFieldWithInit = 0;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in this.{<unresolved>}lateFinalInstanceFieldWithInit = 0;
     invalid-expression "pkg/front_end/testcases/nnbd/late.dart:44:5: Error: Setter not found: 'lateFinalStaticFieldWithInit'.
     lateFinalStaticFieldWithInit = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
@@ -97,7 +97,7 @@ static method errors() → dynamic {
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.lateFinalInstanceFieldWithInit = 0;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}lateFinalInstanceFieldWithInit = 0;
   c.{self::Class::methodWithErrors}(){() → dynamic};
   invalid-expression "pkg/front_end/testcases/nnbd/late.dart:67:9: Error: Setter not found: 'lateFinalStaticFieldWithInit'.
   Class.lateFinalStaticFieldWithInit = 0;
diff --git a/pkg/front_end/testcases/nnbd/late.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/late.dart.weak.modular.expect
index d63a27530bf..5ae8065b0c5 100644
--- a/pkg/front_end/testcases/nnbd/late.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/late.dart.weak.modular.expect
@@ -67,7 +67,7 @@ class Class extends core::Object {
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in this{<unresolved>}.lateFinalInstanceFieldWithInit = 0;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in this.{<unresolved>}lateFinalInstanceFieldWithInit = 0;
     invalid-expression "pkg/front_end/testcases/nnbd/late.dart:44:5: Error: Setter not found: 'lateFinalStaticFieldWithInit'.
     lateFinalStaticFieldWithInit = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
@@ -97,7 +97,7 @@ static method errors() → dynamic {
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.lateFinalInstanceFieldWithInit = 0;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}lateFinalInstanceFieldWithInit = 0;
   c.{self::Class::methodWithErrors}(){() → dynamic};
   invalid-expression "pkg/front_end/testcases/nnbd/late.dart:67:9: Error: Setter not found: 'lateFinalStaticFieldWithInit'.
   Class.lateFinalStaticFieldWithInit = 0;
diff --git a/pkg/front_end/testcases/nnbd/late.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/late.dart.weak.transformed.expect
index d63a27530bf..5ae8065b0c5 100644
--- a/pkg/front_end/testcases/nnbd/late.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/late.dart.weak.transformed.expect
@@ -67,7 +67,7 @@ class Class extends core::Object {
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in this{<unresolved>}.lateFinalInstanceFieldWithInit = 0;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in this.{<unresolved>}lateFinalInstanceFieldWithInit = 0;
     invalid-expression "pkg/front_end/testcases/nnbd/late.dart:44:5: Error: Setter not found: 'lateFinalStaticFieldWithInit'.
     lateFinalStaticFieldWithInit = 0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
@@ -97,7 +97,7 @@ static method errors() → dynamic {
  - '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;
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c{<unresolved>}.lateFinalInstanceFieldWithInit = 0;
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in c.{<unresolved>}lateFinalInstanceFieldWithInit = 0;
   c.{self::Class::methodWithErrors}(){() → dynamic};
   invalid-expression "pkg/front_end/testcases/nnbd/late.dart:67:9: Error: Setter not found: 'lateFinalStaticFieldWithInit'.
   Class.lateFinalStaticFieldWithInit = 0;
diff --git a/pkg/front_end/testcases/nnbd/never_calls.dart.strong.expect b/pkg/front_end/testcases/nnbd/never_calls.dart.strong.expect
index 72ad58450b1..1818e4b8077 100644
--- a/pkg/front_end/testcases/nnbd/never_calls.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/never_calls.dart.strong.expect
@@ -10,7 +10,7 @@ static method propertyGet(Never never) → dynamic {
   Never v5 = never{Never}.noSuchMethod;
 }
 static method propertySet(Never never) → dynamic {
-  core::int v1 = never{Never}.foo = 42;
+  core::int v1 = never.{Never}foo = 42;
 }
 static method methodInvocation(Never never, core::Invocation invocation) → dynamic {
   Never v1 = never{Never}.foo();
diff --git a/pkg/front_end/testcases/nnbd/never_calls.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/never_calls.dart.strong.transformed.expect
index 72ad58450b1..1818e4b8077 100644
--- a/pkg/front_end/testcases/nnbd/never_calls.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/never_calls.dart.strong.transformed.expect
@@ -10,7 +10,7 @@ static method propertyGet(Never never) → dynamic {
   Never v5 = never{Never}.noSuchMethod;
 }
 static method propertySet(Never never) → dynamic {
-  core::int v1 = never{Never}.foo = 42;
+  core::int v1 = never.{Never}foo = 42;
 }
 static method methodInvocation(Never never, core::Invocation invocation) → dynamic {
   Never v1 = never{Never}.foo();
diff --git a/pkg/front_end/testcases/nnbd/never_calls.dart.weak.expect b/pkg/front_end/testcases/nnbd/never_calls.dart.weak.expect
index 4f7cc79f1ba..8f48b95a9e3 100644
--- a/pkg/front_end/testcases/nnbd/never_calls.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/never_calls.dart.weak.expect
@@ -11,7 +11,7 @@ static method propertyGet(Never never) → dynamic {
   Never v5 = let final Never #t9 = (let final Never #t10 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.noSuchMethod in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
 }
 static method propertySet(Never never) → dynamic {
-  core::int v1 = (let final Never #t11 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo = 42;
+  core::int v1 = (let final Never #t11 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}foo = 42;
 }
 static method methodInvocation(Never never, core::Invocation invocation) → dynamic {
   Never v1 = let final Never #t12 = (let final Never #t13 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
diff --git a/pkg/front_end/testcases/nnbd/never_calls.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/never_calls.dart.weak.modular.expect
index 4f7cc79f1ba..8f48b95a9e3 100644
--- a/pkg/front_end/testcases/nnbd/never_calls.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/never_calls.dart.weak.modular.expect
@@ -11,7 +11,7 @@ static method propertyGet(Never never) → dynamic {
   Never v5 = let final Never #t9 = (let final Never #t10 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.noSuchMethod in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
 }
 static method propertySet(Never never) → dynamic {
-  core::int v1 = (let final Never #t11 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo = 42;
+  core::int v1 = (let final Never #t11 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}foo = 42;
 }
 static method methodInvocation(Never never, core::Invocation invocation) → dynamic {
   Never v1 = let final Never #t12 = (let final Never #t13 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
diff --git a/pkg/front_end/testcases/nnbd/never_calls.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/never_calls.dart.weak.transformed.expect
index 4f7cc79f1ba..8f48b95a9e3 100644
--- a/pkg/front_end/testcases/nnbd/never_calls.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/never_calls.dart.weak.transformed.expect
@@ -11,7 +11,7 @@ static method propertyGet(Never never) → dynamic {
   Never v5 = let final Never #t9 = (let final Never #t10 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.noSuchMethod in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
 }
 static method propertySet(Never never) → dynamic {
-  core::int v1 = (let final Never #t11 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo = 42;
+  core::int v1 = (let final Never #t11 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}foo = 42;
 }
 static method methodInvocation(Never never, core::Invocation invocation) → dynamic {
   Never v1 = let final Never #t12 = (let final Never #t13 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
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 26bcc8a44a1..3a4109c860d 100644
--- a/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/never_receiver.dart.strong.expect
@@ -70,7 +70,7 @@ static method foo(Never x, Never? y) → dynamic {
   core::int local1 = y.{core::Object::hashCode}{<object>}.{core::int};
   x{Never}.foo();
   x{Never}.bar;
-  x{Never}.baz = 42;
+  x.{Never}baz = 42;
   x{Never}.call();
   x{Never}.[](42);
   x{Never}.[]=(42, 42);
@@ -78,13 +78,13 @@ static method foo(Never x, Never? y) → dynamic {
   x = x{Never}.+(1);
   let final Never? #t1 = y in #t1 == null ?{Null} null : #t1{Never}{Never}.foo();
   let final Never? #t2 = y in #t2 == null ?{Null} null : #t2{Never}{Never}.bar;
-  let final Never? #t3 = y in #t3 == null ?{core::int?} null : #t3{Never}{Never}.baz = 42;
+  let final Never? #t3 = y in #t3 == null ?{core::int?} null : #t3{Never}.{Never}baz = 42;
   let final Never? #t4 = y in #t4 == null ?{Null} null : #t4{Never}{Never}.call();
   let final Never? #t5 = y in #t5 == null ?{Null} null : #t5{Never}{Never}.[](42);
   let final Never? #t6 = y in #t6 == null ?{core::int?} null : #t6{Never}{Never}.[]=(42, 42);
   let final Never #t7 = x in #t7 == null ?{Null} null : #t7{Never}.foo();
   let final Never #t8 = x in #t8 == null ?{Null} null : #t8{Never}.bar;
-  let final Never #t9 = x in #t9 == null ?{core::int?} null : #t9{Never}.baz = 42;
+  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?'.
@@ -98,7 +98,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class '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;
+    ^^^" 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?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   y(); // Error.
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 7857c074bd8..5a67b618fc2 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
@@ -70,7 +70,7 @@ static method foo(Never x, Never? y) → dynamic {
   core::int local1 = y.{core::Object::hashCode}{<object>}.{core::int};
   x{Never}.foo();
   x{Never}.bar;
-  x{Never}.baz = 42;
+  x.{Never}baz = 42;
   x{Never}.call();
   x{Never}.[](42);
   x{Never}.[]=(42, 42);
@@ -78,13 +78,13 @@ static method foo(Never x, Never? y) → dynamic {
   x = x{Never}.+(1);
   let final Never? #t1 = y in #t1 == null ?{Null} null : #t1{Never}{Never}.foo();
   let final Never? #t2 = y in #t2 == null ?{Null} null : #t2{Never}{Never}.bar;
-  let final Never? #t3 = y in #t3 == null ?{core::int?} null : #t3{Never}{Never}.baz = 42;
+  let final Never? #t3 = y in #t3 == null ?{core::int?} null : #t3{Never}.{Never}baz = 42;
   let final Never? #t4 = y in #t4 == null ?{Null} null : #t4{Never}{Never}.call();
   let final Never? #t5 = y in #t5 == null ?{Null} null : #t5{Never}{Never}.[](42);
   let final Never? #t6 = y in #t6 == null ?{core::int?} null : #t6{Never}{Never}.[]=(42, 42);
   let final Never #t7 = x in #t7 == null ?{Null} null : #t7{Never}.foo();
   let final Never #t8 = x in #t8 == null ?{Null} null : #t8{Never}.bar;
-  let final Never #t9 = x in #t9 == null ?{core::int?} null : #t9{Never}.baz = 42;
+  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?'.
@@ -98,7 +98,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class '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;
+    ^^^" 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?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   y(); // Error.
diff --git a/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.expect b/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.expect
index e890448dd19..0caa843f663 100644
--- a/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.expect
@@ -71,7 +71,7 @@ static method foo(Never x, Never? y) → dynamic {
   core::int local1 = y.{core::Object::hashCode}{<object>}.{core::int};
   let final Never #t1 = (let final Never #t2 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t3 = (let final Never #t4 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.bar in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  (let final Never #t5 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.baz = 42;
+  (let final Never #t5 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}baz = 42;
   let final Never #t6 = (let final Never #t7 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.call() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t8 = (let final Never #t9 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[](42) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   (let final Never #t10 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[]=(42, 42);
@@ -79,13 +79,13 @@ static method foo(Never x, Never? y) → dynamic {
   let final Never #t14 = x = let final Never #t15 = (let final Never #t16 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.+(1) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t17 = y in #t17 == null ?{Null} null : let final Never #t18 = (let final Never #t19 = #t17{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t20 = y in #t20 == null ?{Null} null : let final Never #t21 = (let final Never #t22 = #t20{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.bar in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  let final Never? #t23 = y in #t23 == null ?{core::int?} null : (let final Never #t24 = #t23{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.baz = 42;
+  let final Never? #t23 = y in #t23 == null ?{core::int?} null : (let final Never #t24 = #t23{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}baz = 42;
   let final Never? #t25 = y in #t25 == null ?{Null} null : let final Never #t26 = (let final Never #t27 = #t25{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.call() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t28 = y in #t28 == null ?{Null} null : let final Never #t29 = (let final Never #t30 = #t28{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[](42) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t31 = y in #t31 == null ?{core::int?} null : (let final Never #t32 = #t31{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[]=(42, 42);
   let final Never #t33 = let final Never #t34 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t33 == null ?{Null} null : let final Never #t35 = (let final Never #t36 = #t33 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t37 = let final Never #t38 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t37 == null ?{Null} null : let final Never #t39 = (let final Never #t40 = #t37 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.bar in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  let final Never #t41 = let final Never #t42 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t41 == null ?{core::int?} null : (let final Never #t43 = #t41 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.baz = 42;
+  let final Never #t41 = let final Never #t42 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t41 == null ?{core::int?} null : (let final Never #t43 = #t41 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}baz = 42;
   let final Never #t44 = let final Never #t45 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t44 == null ?{Null} null : let final Never #t46 = (let final Never #t47 = #t44 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[](42) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t48 = let final Never #t49 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t48 == null ?{core::int?} null : (let final Never #t50 = #t48 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){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?'.
@@ -99,7 +99,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class '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;
+    ^^^" 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?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   y(); // Error.
diff --git a/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.modular.expect
index e890448dd19..0caa843f663 100644
--- a/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.modular.expect
@@ -71,7 +71,7 @@ static method foo(Never x, Never? y) → dynamic {
   core::int local1 = y.{core::Object::hashCode}{<object>}.{core::int};
   let final Never #t1 = (let final Never #t2 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t3 = (let final Never #t4 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.bar in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  (let final Never #t5 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.baz = 42;
+  (let final Never #t5 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}baz = 42;
   let final Never #t6 = (let final Never #t7 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.call() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t8 = (let final Never #t9 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[](42) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   (let final Never #t10 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[]=(42, 42);
@@ -79,13 +79,13 @@ static method foo(Never x, Never? y) → dynamic {
   let final Never #t14 = x = let final Never #t15 = (let final Never #t16 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.+(1) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t17 = y in #t17 == null ?{Null} null : let final Never #t18 = (let final Never #t19 = #t17{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t20 = y in #t20 == null ?{Null} null : let final Never #t21 = (let final Never #t22 = #t20{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.bar in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  let final Never? #t23 = y in #t23 == null ?{core::int?} null : (let final Never #t24 = #t23{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.baz = 42;
+  let final Never? #t23 = y in #t23 == null ?{core::int?} null : (let final Never #t24 = #t23{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}baz = 42;
   let final Never? #t25 = y in #t25 == null ?{Null} null : let final Never #t26 = (let final Never #t27 = #t25{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.call() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t28 = y in #t28 == null ?{Null} null : let final Never #t29 = (let final Never #t30 = #t28{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[](42) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t31 = y in #t31 == null ?{core::int?} null : (let final Never #t32 = #t31{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[]=(42, 42);
   let final Never #t33 = let final Never #t34 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t33 == null ?{Null} null : let final Never #t35 = (let final Never #t36 = #t33 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t37 = let final Never #t38 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t37 == null ?{Null} null : let final Never #t39 = (let final Never #t40 = #t37 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.bar in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  let final Never #t41 = let final Never #t42 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t41 == null ?{core::int?} null : (let final Never #t43 = #t41 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.baz = 42;
+  let final Never #t41 = let final Never #t42 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t41 == null ?{core::int?} null : (let final Never #t43 = #t41 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}baz = 42;
   let final Never #t44 = let final Never #t45 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t44 == null ?{Null} null : let final Never #t46 = (let final Never #t47 = #t44 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[](42) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t48 = let final Never #t49 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t48 == null ?{core::int?} null : (let final Never #t50 = #t48 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){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?'.
@@ -99,7 +99,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class '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;
+    ^^^" 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?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   y(); // Error.
diff --git a/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.transformed.expect
index 5df32ea9a18..e3afc231376 100644
--- a/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/never_receiver.dart.weak.transformed.expect
@@ -71,7 +71,7 @@ static method foo(Never x, Never? y) → dynamic {
   core::int local1 = y.{core::Object::hashCode}{<object>}.{core::int};
   let final Never #t1 = (let final Never #t2 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t3 = (let final Never #t4 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.bar in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  (let final Never #t5 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.baz = 42;
+  (let final Never #t5 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}baz = 42;
   let final Never #t6 = (let final Never #t7 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.call() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t8 = (let final Never #t9 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[](42) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   (let final Never #t10 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[]=(42, 42);
@@ -79,13 +79,13 @@ static method foo(Never x, Never? y) → dynamic {
   let final Never #t14 = x = let final Never #t15 = (let final Never #t16 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.+(1) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t17 = y in #t17 == null ?{Null} null : let final Never #t18 = (let final Never #t19 = #t17{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t20 = y in #t20 == null ?{Null} null : let final Never #t21 = (let final Never #t22 = #t20{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.bar in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  let final Never? #t23 = y in #t23 == null ?{core::int?} null : (let final Never #t24 = #t23{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.baz = 42;
+  let final Never? #t23 = y in #t23 == null ?{core::int?} null : (let final Never #t24 = #t23{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}baz = 42;
   let final Never? #t25 = y in #t25 == null ?{Null} null : let final Never #t26 = (let final Never #t27 = #t25{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.call() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t28 = y in #t28 == null ?{Null} null : let final Never #t29 = (let final Never #t30 = #t28{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[](42) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never? #t31 = y in #t31 == null ?{core::int?} null : (let final Never #t32 = #t31{Never} in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[]=(42, 42);
   let final Never #t33 = let final Never #t34 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t33 == null ?{Null} null : let final Never #t35 = (let final Never #t36 = #t33 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.foo() in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t37 = let final Never #t38 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t37 == null ?{Null} null : let final Never #t39 = (let final Never #t40 = #t37 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.bar in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
-  let final Never #t41 = let final Never #t42 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t41 == null ?{core::int?} null : (let final Never #t43 = #t41 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.baz = 42;
+  let final Never #t41 = let final Never #t42 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t41 == null ?{core::int?} null : (let final Never #t43 = #t41 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}baz = 42;
   let final Never #t44 = let final Never #t45 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t44 == null ?{Null} null : let final Never #t46 = (let final Never #t47 = #t44 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.[](42) in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
   let final Never #t48 = let final Never #t49 = x in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.") in #t48 == null ?{core::int?} null : (let final Never #t50 = #t48 in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){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?'.
@@ -99,7 +99,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/never_receiver.dart:32:5: Error: The setter 'baz' isn't defined for the class '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;
+    ^^^" 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?'.
 Try correcting the name to the name of an existing method, or defining a method named 'call'.
   y(); // Error.
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 7fa69a34ca3..1a5d2025f61 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
@@ -203,7 +203,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class '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 = self::Extension|extensionInstanceMethodAndSetter(0);
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = self::Extension|extensionInstanceMethodAndSetter(0);
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:65:13: Error: Setter not found: 'extensionStaticMethodAndSetter'.
   Extension.extensionStaticMethodAndSetter =
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
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 7fa69a34ca3..1a5d2025f61 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
@@ -203,7 +203,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class '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 = self::Extension|extensionInstanceMethodAndSetter(0);
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = self::Extension|extensionInstanceMethodAndSetter(0);
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:65:13: Error: Setter not found: 'extensionStaticMethodAndSetter'.
   Extension.extensionStaticMethodAndSetter =
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.expect b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.expect
index 7fa69a34ca3..1a5d2025f61 100644
--- a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.expect
@@ -203,7 +203,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class '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 = self::Extension|extensionInstanceMethodAndSetter(0);
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = self::Extension|extensionInstanceMethodAndSetter(0);
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:65:13: Error: Setter not found: 'extensionStaticMethodAndSetter'.
   Extension.extensionStaticMethodAndSetter =
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.modular.expect
index 7fa69a34ca3..1a5d2025f61 100644
--- a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.modular.expect
@@ -203,7 +203,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class '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 = self::Extension|extensionInstanceMethodAndSetter(0);
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = self::Extension|extensionInstanceMethodAndSetter(0);
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:65:13: Error: Setter not found: 'extensionStaticMethodAndSetter'.
   Extension.extensionStaticMethodAndSetter =
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.transformed.expect
index 7fa69a34ca3..1a5d2025f61 100644
--- a/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart.weak.transformed.expect
@@ -203,7 +203,7 @@ Try correcting the name to the name of an existing getter, or defining a getter
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:63:5: Error: The setter 'extensionInstanceFieldAndSetter' isn't defined for the class '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 = self::Extension|extensionInstanceMethodAndSetter(0);
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" in 0.{<unresolved>}extensionInstanceFieldAndSetter = self::Extension|extensionInstanceMethodAndSetter(0);
   invalid-expression "pkg/front_end/testcases/nnbd/nonfield_vs_setter.dart:65:13: Error: Setter not found: 'extensionStaticMethodAndSetter'.
   Extension.extensionStaticMethodAndSetter =
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.strong.expect
index 071cbaeed0f..ae5dfa2a45d 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.strong.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.strong.expect
@@ -35,7 +35,7 @@ static method expectTypeError(() → dynamic callback) → void {
 static method main() → dynamic {
   self::A a = new self::A::•();
   self::expectTypeError(() → core::int? => a.{self::A::foo}{core::int?});
-  self::expectTypeError(() → core::String => (a as dynamic){dynamic}.foo = "bar");
+  self::expectTypeError(() → core::String => (a as dynamic).{dynamic}foo = "bar");
 }
 
 constants  {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.strong.transformed.expect
index 7f7fa0b17c4..3cd24f6ff1b 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.strong.transformed.expect
@@ -35,7 +35,7 @@ static method expectTypeError(() → dynamic callback) → void {
 static method main() → dynamic {
   self::A a = new self::A::•();
   self::expectTypeError(() → core::int? => a.{self::A::foo}{core::int?});
-  self::expectTypeError(() → core::String => (a as dynamic){dynamic}.foo = "bar");
+  self::expectTypeError(() → core::String => (a as dynamic).{dynamic}foo = "bar");
 }
 
 constants  {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.expect
index 071cbaeed0f..ae5dfa2a45d 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.expect
@@ -35,7 +35,7 @@ static method expectTypeError(() → dynamic callback) → void {
 static method main() → dynamic {
   self::A a = new self::A::•();
   self::expectTypeError(() → core::int? => a.{self::A::foo}{core::int?});
-  self::expectTypeError(() → core::String => (a as dynamic){dynamic}.foo = "bar");
+  self::expectTypeError(() → core::String => (a as dynamic).{dynamic}foo = "bar");
 }
 
 constants  {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.modular.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.modular.expect
index 071cbaeed0f..ae5dfa2a45d 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.modular.expect
@@ -35,7 +35,7 @@ static method expectTypeError(() → dynamic callback) → void {
 static method main() → dynamic {
   self::A a = new self::A::•();
   self::expectTypeError(() → core::int? => a.{self::A::foo}{core::int?});
-  self::expectTypeError(() → core::String => (a as dynamic){dynamic}.foo = "bar");
+  self::expectTypeError(() → core::String => (a as dynamic).{dynamic}foo = "bar");
 }
 
 constants  {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.transformed.expect
index 7f7fa0b17c4..3cd24f6ff1b 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field.dart.weak.transformed.expect
@@ -35,7 +35,7 @@ static method expectTypeError(() → dynamic callback) → void {
 static method main() → dynamic {
   self::A a = new self::A::•();
   self::expectTypeError(() → core::int? => a.{self::A::foo}{core::int?});
-  self::expectTypeError(() → core::String => (a as dynamic){dynamic}.foo = "bar");
+  self::expectTypeError(() → core::String => (a as dynamic).{dynamic}foo = "bar");
 }
 
 constants  {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.strong.expect
index 32789c53620..f33666a6d9e 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.strong.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.strong.expect
@@ -49,7 +49,7 @@ static method expectTypeError(() → dynamic callback) → void {
 }
 static method main() → dynamic {
   self::C c = new self::C::•();
-  self::expectTypeError(() → core::String => (c as dynamic){dynamic}.foo = "bar");
+  self::expectTypeError(() → core::String => (c as dynamic).{dynamic}foo = "bar");
   self::E e = new self::E::•();
   self::expectTypeError(() → core::int? => e.{self::E::foo}{core::int?});
 }
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.strong.transformed.expect
index 46571e570f8..069c0da0924 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.strong.transformed.expect
@@ -49,7 +49,7 @@ static method expectTypeError(() → dynamic callback) → void {
 }
 static method main() → dynamic {
   self::C c = new self::C::•();
-  self::expectTypeError(() → core::String => (c as dynamic){dynamic}.foo = "bar");
+  self::expectTypeError(() → core::String => (c as dynamic).{dynamic}foo = "bar");
   self::E e = new self::E::•();
   self::expectTypeError(() → core::int? => e.{self::E::foo}{core::int?});
 }
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.expect
index 32789c53620..f33666a6d9e 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.expect
@@ -49,7 +49,7 @@ static method expectTypeError(() → dynamic callback) → void {
 }
 static method main() → dynamic {
   self::C c = new self::C::•();
-  self::expectTypeError(() → core::String => (c as dynamic){dynamic}.foo = "bar");
+  self::expectTypeError(() → core::String => (c as dynamic).{dynamic}foo = "bar");
   self::E e = new self::E::•();
   self::expectTypeError(() → core::int? => e.{self::E::foo}{core::int?});
 }
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.modular.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.modular.expect
index 32789c53620..f33666a6d9e 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.modular.expect
@@ -49,7 +49,7 @@ static method expectTypeError(() → dynamic callback) → void {
 }
 static method main() → dynamic {
   self::C c = new self::C::•();
-  self::expectTypeError(() → core::String => (c as dynamic){dynamic}.foo = "bar");
+  self::expectTypeError(() → core::String => (c as dynamic).{dynamic}foo = "bar");
   self::E e = new self::E::•();
   self::expectTypeError(() → core::int? => e.{self::E::foo}{core::int?});
 }
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.transformed.expect
index 46571e570f8..069c0da0924 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_one_defined.dart.weak.transformed.expect
@@ -49,7 +49,7 @@ static method expectTypeError(() → dynamic callback) → void {
 }
 static method main() → dynamic {
   self::C c = new self::C::•();
-  self::expectTypeError(() → core::String => (c as dynamic){dynamic}.foo = "bar");
+  self::expectTypeError(() → core::String => (c as dynamic).{dynamic}foo = "bar");
   self::E e = new self::E::•();
   self::expectTypeError(() → core::int? => e.{self::E::foo}{core::int?});
 }
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.strong.expect
index 3914c51c992..147928a13d4 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.strong.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.strong.expect
@@ -30,7 +30,7 @@ static method expectTypeError(() → dynamic callback) → void {
 static method main() → dynamic {
   self::B b = new self::B::•();
   self::expectTypeError(() → core::List<core::int>? => b.{self::B::foo}{core::List<core::int>?});
-  self::expectTypeError(() → core::List<dynamic> => (b as dynamic){dynamic}.foo = <dynamic>[]);
+  self::expectTypeError(() → core::List<dynamic> => (b as dynamic).{dynamic}foo = <dynamic>[]);
 }
 
 constants  {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.strong.transformed.expect
index db2f35024c3..2ebd8b13440 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.strong.transformed.expect
@@ -30,7 +30,7 @@ static method expectTypeError(() → dynamic callback) → void {
 static method main() → dynamic {
   self::B b = new self::B::•();
   self::expectTypeError(() → core::List<core::int>? => b.{self::B::foo}{core::List<core::int>?});
-  self::expectTypeError(() → core::List<dynamic> => (b as dynamic){dynamic}.foo = core::_GrowableList::•<dynamic>(0));
+  self::expectTypeError(() → core::List<dynamic> => (b as dynamic).{dynamic}foo = core::_GrowableList::•<dynamic>(0));
 }
 
 constants  {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.expect
index 3914c51c992..147928a13d4 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.expect
@@ -30,7 +30,7 @@ static method expectTypeError(() → dynamic callback) → void {
 static method main() → dynamic {
   self::B b = new self::B::•();
   self::expectTypeError(() → core::List<core::int>? => b.{self::B::foo}{core::List<core::int>?});
-  self::expectTypeError(() → core::List<dynamic> => (b as dynamic){dynamic}.foo = <dynamic>[]);
+  self::expectTypeError(() → core::List<dynamic> => (b as dynamic).{dynamic}foo = <dynamic>[]);
 }
 
 constants  {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.modular.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.modular.expect
index 3914c51c992..147928a13d4 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.modular.expect
@@ -30,7 +30,7 @@ static method expectTypeError(() → dynamic callback) → void {
 static method main() → dynamic {
   self::B b = new self::B::•();
   self::expectTypeError(() → core::List<core::int>? => b.{self::B::foo}{core::List<core::int>?});
-  self::expectTypeError(() → core::List<dynamic> => (b as dynamic){dynamic}.foo = <dynamic>[]);
+  self::expectTypeError(() → core::List<dynamic> => (b as dynamic).{dynamic}foo = <dynamic>[]);
 }
 
 constants  {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.transformed.expect
index db2f35024c3..2ebd8b13440 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_with_substitution.dart.weak.transformed.expect
@@ -30,7 +30,7 @@ static method expectTypeError(() → dynamic callback) → void {
 static method main() → dynamic {
   self::B b = new self::B::•();
   self::expectTypeError(() → core::List<core::int>? => b.{self::B::foo}{core::List<core::int>?});
-  self::expectTypeError(() → core::List<dynamic> => (b as dynamic){dynamic}.foo = core::_GrowableList::•<dynamic>(0));
+  self::expectTypeError(() → core::List<dynamic> => (b as dynamic).{dynamic}foo = core::_GrowableList::•<dynamic>(0));
 }
 
 constants  {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.strong.expect
index 1a4d124fd3c..ce17c91fabe 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.strong.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.strong.expect
@@ -37,14 +37,14 @@ static method main() → dynamic {
       baba{self::You}.{self::You::float} = 4.5;
     }
     try {
-      (baba as dynamic){dynamic}.push = 6.7;
+      (baba as dynamic).{dynamic}push = 6.7;
       baba is self::You || (throw "Fail!");
     }
     on core::TypeError catch(no-exception-var) {
       baba is self::Me || (throw "Fail!");
     }
     try {
-      (baba as dynamic){dynamic}.float = 8.9;
+      (baba as dynamic).{dynamic}float = 8.9;
       baba is self::You || (throw "Fail!");
     }
     on core::TypeError catch(no-exception-var) {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.strong.transformed.expect
index ff3052d9ffa..ea0f22920c3 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.strong.transformed.expect
@@ -41,14 +41,14 @@ static method main() → dynamic {
           baba{self::You}.{self::You::float} = 4.5;
         }
         try {
-          (baba as dynamic){dynamic}.push = 6.7;
+          (baba as dynamic).{dynamic}push = 6.7;
           baba is self::You || (throw "Fail!");
         }
         on core::TypeError catch(no-exception-var) {
           baba is self::Me || (throw "Fail!");
         }
         try {
-          (baba as dynamic){dynamic}.float = 8.9;
+          (baba as dynamic).{dynamic}float = 8.9;
           baba is self::You || (throw "Fail!");
         }
         on core::TypeError catch(no-exception-var) {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.expect
index 1a4d124fd3c..ce17c91fabe 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.expect
@@ -37,14 +37,14 @@ static method main() → dynamic {
       baba{self::You}.{self::You::float} = 4.5;
     }
     try {
-      (baba as dynamic){dynamic}.push = 6.7;
+      (baba as dynamic).{dynamic}push = 6.7;
       baba is self::You || (throw "Fail!");
     }
     on core::TypeError catch(no-exception-var) {
       baba is self::Me || (throw "Fail!");
     }
     try {
-      (baba as dynamic){dynamic}.float = 8.9;
+      (baba as dynamic).{dynamic}float = 8.9;
       baba is self::You || (throw "Fail!");
     }
     on core::TypeError catch(no-exception-var) {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.modular.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.modular.expect
index 1a4d124fd3c..ce17c91fabe 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.modular.expect
@@ -37,14 +37,14 @@ static method main() → dynamic {
       baba{self::You}.{self::You::float} = 4.5;
     }
     try {
-      (baba as dynamic){dynamic}.push = 6.7;
+      (baba as dynamic).{dynamic}push = 6.7;
       baba is self::You || (throw "Fail!");
     }
     on core::TypeError catch(no-exception-var) {
       baba is self::Me || (throw "Fail!");
     }
     try {
-      (baba as dynamic){dynamic}.float = 8.9;
+      (baba as dynamic).{dynamic}float = 8.9;
       baba is self::You || (throw "Fail!");
     }
     on core::TypeError catch(no-exception-var) {
diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.transformed.expect
index ff3052d9ffa..ea0f22920c3 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_override_abstract_different_type.dart.weak.transformed.expect
@@ -41,14 +41,14 @@ static method main() → dynamic {
           baba{self::You}.{self::You::float} = 4.5;
         }
         try {
-          (baba as dynamic){dynamic}.push = 6.7;
+          (baba as dynamic).{dynamic}push = 6.7;
           baba is self::You || (throw "Fail!");
         }
         on core::TypeError catch(no-exception-var) {
           baba is self::Me || (throw "Fail!");
         }
         try {
-          (baba as dynamic){dynamic}.float = 8.9;
+          (baba as dynamic).{dynamic}float = 8.9;
           baba is self::You || (throw "Fail!");
         }
         on core::TypeError catch(no-exception-var) {
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 6064c61162d..91133c1b81c 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
@@ -32,11 +32,11 @@ static method test(self::Class c, dynamic d, core::Function f1, () → void f2)
  - '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;
-    ^^^^^^" in c{<unresolved>}.setter = c.{self::Class::getter}{() → core::int?};
+    ^^^^^^" in c.{<unresolved>}setter = c.{self::Class::getter}{() → core::int?};
   c.{self::Class::method}{() → void};
   c.{self::Class::method}(){() → void};
-  d{dynamic}.field = d{dynamic}.field;
-  d{dynamic}.setter = d{dynamic}.getter;
+  d.{dynamic}field = d{dynamic}.field;
+  d.{dynamic}setter = d{dynamic}.getter;
   d{dynamic}.method;
   d{dynamic}.method();
   f1();
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 6064c61162d..91133c1b81c 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
@@ -32,11 +32,11 @@ static method test(self::Class c, dynamic d, core::Function f1, () → void f2)
  - '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;
-    ^^^^^^" in c{<unresolved>}.setter = c.{self::Class::getter}{() → core::int?};
+    ^^^^^^" in c.{<unresolved>}setter = c.{self::Class::getter}{() → core::int?};
   c.{self::Class::method}{() → void};
   c.{self::Class::method}(){() → void};
-  d{dynamic}.field = d{dynamic}.field;
-  d{dynamic}.setter = d{dynamic}.getter;
+  d.{dynamic}field = d{dynamic}.field;
+  d.{dynamic}setter = d{dynamic}.getter;
   d{dynamic}.method;
   d{dynamic}.method();
   f1();
diff --git a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.expect b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.expect
index 6064c61162d..91133c1b81c 100644
--- a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.expect
+++ b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.expect
@@ -32,11 +32,11 @@ static method test(self::Class c, dynamic d, core::Function f1, () → void f2)
  - '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;
-    ^^^^^^" in c{<unresolved>}.setter = c.{self::Class::getter}{() → core::int?};
+    ^^^^^^" in c.{<unresolved>}setter = c.{self::Class::getter}{() → core::int?};
   c.{self::Class::method}{() → void};
   c.{self::Class::method}(){() → void};
-  d{dynamic}.field = d{dynamic}.field;
-  d{dynamic}.setter = d{dynamic}.getter;
+  d.{dynamic}field = d{dynamic}.field;
+  d.{dynamic}setter = d{dynamic}.getter;
   d{dynamic}.method;
   d{dynamic}.method();
   f1();
diff --git a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.modular.expect b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.modular.expect
index 6064c61162d..91133c1b81c 100644
--- a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.modular.expect
@@ -32,11 +32,11 @@ static method test(self::Class c, dynamic d, core::Function f1, () → void f2)
  - '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;
-    ^^^^^^" in c{<unresolved>}.setter = c.{self::Class::getter}{() → core::int?};
+    ^^^^^^" in c.{<unresolved>}setter = c.{self::Class::getter}{() → core::int?};
   c.{self::Class::method}{() → void};
   c.{self::Class::method}(){() → void};
-  d{dynamic}.field = d{dynamic}.field;
-  d{dynamic}.setter = d{dynamic}.getter;
+  d.{dynamic}field = d{dynamic}.field;
+  d.{dynamic}setter = d{dynamic}.getter;
   d{dynamic}.method;
   d{dynamic}.method();
   f1();
diff --git a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.transformed.expect b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.transformed.expect
index 6064c61162d..91133c1b81c 100644
--- a/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/none/new_method_invocation_encodings.dart.weak.transformed.expect
@@ -32,11 +32,11 @@ static method test(self::Class c, dynamic d, core::Function f1, () → void f2)
  - '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;
-    ^^^^^^" in c{<unresolved>}.setter = c.{self::Class::getter}{() → core::int?};
+    ^^^^^^" in c.{<unresolved>}setter = c.{self::Class::getter}{() → core::int?};
   c.{self::Class::method}{() → void};
   c.{self::Class::method}(){() → void};
-  d{dynamic}.field = d{dynamic}.field;
-  d{dynamic}.setter = d{dynamic}.getter;
+  d.{dynamic}field = d{dynamic}.field;
+  d.{dynamic}setter = d{dynamic}.getter;
   d{dynamic}.method;
   d{dynamic}.method();
   f1();
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 03c44783188..7115d2559cf 100644
--- a/pkg/front_end/testcases/none/property_set.dart.strong.expect
+++ b/pkg/front_end/testcases/none/property_set.dart.strong.expect
@@ -46,22 +46,22 @@ static method test(self::Class1 nonNullableClass1, self::Class1? nullableClass1,
   const int set_instance_field = nonNullableClass1.field = 42;
                                                          ^";
   core::print("DynamicSet");
-  dyn{dynamic}.field = 42;
-  let final dynamic #t2 = dyn in #t2 == null ?{core::int?} null : #t2{dynamic}.field = 42;
+  dyn.{dynamic}field = 42;
+  let final dynamic #t2 = dyn in #t2 == null ?{core::int?} null : #t2.{dynamic}field = 42;
   const core::int set_dynamic_field = invalid-expression "pkg/front_end/testcases/none/property_set.dart:23:43: Error: Not a constant expression.
   const int set_dynamic_field = dyn.field = 42;
                                           ^";
   core::print("DynamicSet (Never)");
-  never{Never}.field = 42;
+  never.{Never}field = 42;
   core::print("DynamicSet (Invalid)");
   invalid-expression "pkg/front_end/testcases/none/property_set.dart:29:27: Error: Too few positional arguments: 1 required, 0 given.
   nonNullableClass1.method().field = 42;
-                          ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.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'.
  - '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;
-                    ^^^^^^^^^^" in nonNullableClass1{<unresolved>}.unresolved = 42;
+                    ^^^^^^^^^^" in nonNullableClass1.{<unresolved>}unresolved = 42;
 }
 static method main() → dynamic {}
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 03c44783188..7115d2559cf 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
@@ -46,22 +46,22 @@ static method test(self::Class1 nonNullableClass1, self::Class1? nullableClass1,
   const int set_instance_field = nonNullableClass1.field = 42;
                                                          ^";
   core::print("DynamicSet");
-  dyn{dynamic}.field = 42;
-  let final dynamic #t2 = dyn in #t2 == null ?{core::int?} null : #t2{dynamic}.field = 42;
+  dyn.{dynamic}field = 42;
+  let final dynamic #t2 = dyn in #t2 == null ?{core::int?} null : #t2.{dynamic}field = 42;
   const core::int set_dynamic_field = invalid-expression "pkg/front_end/testcases/none/property_set.dart:23:43: Error: Not a constant expression.
   const int set_dynamic_field = dyn.field = 42;
                                           ^";
   core::print("DynamicSet (Never)");
-  never{Never}.field = 42;
+  never.{Never}field = 42;
   core::print("DynamicSet (Invalid)");
   invalid-expression "pkg/front_end/testcases/none/property_set.dart:29:27: Error: Too few positional arguments: 1 required, 0 given.
   nonNullableClass1.method().field = 42;
-                          ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.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'.
  - '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;
-                    ^^^^^^^^^^" in nonNullableClass1{<unresolved>}.unresolved = 42;
+                    ^^^^^^^^^^" in nonNullableClass1.{<unresolved>}unresolved = 42;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/none/property_set.dart.weak.expect b/pkg/front_end/testcases/none/property_set.dart.weak.expect
index 2f5d871e9f8..d1bc9e22653 100644
--- a/pkg/front_end/testcases/none/property_set.dart.weak.expect
+++ b/pkg/front_end/testcases/none/property_set.dart.weak.expect
@@ -47,22 +47,22 @@ static method test(self::Class1 nonNullableClass1, self::Class1? nullableClass1,
   const int set_instance_field = nonNullableClass1.field = 42;
                                                          ^";
   core::print("DynamicSet");
-  dyn{dynamic}.field = 42;
-  let final dynamic #t2 = dyn in #t2 == null ?{core::int?} null : #t2{dynamic}.field = 42;
+  dyn.{dynamic}field = 42;
+  let final dynamic #t2 = dyn in #t2 == null ?{core::int?} null : #t2.{dynamic}field = 42;
   const core::int set_dynamic_field = invalid-expression "pkg/front_end/testcases/none/property_set.dart:23:43: Error: Not a constant expression.
   const int set_dynamic_field = dyn.field = 42;
                                           ^";
   core::print("DynamicSet (Never)");
-  (let final Never #t3 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.field = 42;
+  (let final Never #t3 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}field = 42;
   core::print("DynamicSet (Invalid)");
   invalid-expression "pkg/front_end/testcases/none/property_set.dart:29:27: Error: Too few positional arguments: 1 required, 0 given.
   nonNullableClass1.method().field = 42;
-                          ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.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'.
  - '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;
-                    ^^^^^^^^^^" in nonNullableClass1{<unresolved>}.unresolved = 42;
+                    ^^^^^^^^^^" in nonNullableClass1.{<unresolved>}unresolved = 42;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/none/property_set.dart.weak.modular.expect b/pkg/front_end/testcases/none/property_set.dart.weak.modular.expect
index 2f5d871e9f8..d1bc9e22653 100644
--- a/pkg/front_end/testcases/none/property_set.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/none/property_set.dart.weak.modular.expect
@@ -47,22 +47,22 @@ static method test(self::Class1 nonNullableClass1, self::Class1? nullableClass1,
   const int set_instance_field = nonNullableClass1.field = 42;
                                                          ^";
   core::print("DynamicSet");
-  dyn{dynamic}.field = 42;
-  let final dynamic #t2 = dyn in #t2 == null ?{core::int?} null : #t2{dynamic}.field = 42;
+  dyn.{dynamic}field = 42;
+  let final dynamic #t2 = dyn in #t2 == null ?{core::int?} null : #t2.{dynamic}field = 42;
   const core::int set_dynamic_field = invalid-expression "pkg/front_end/testcases/none/property_set.dart:23:43: Error: Not a constant expression.
   const int set_dynamic_field = dyn.field = 42;
                                           ^";
   core::print("DynamicSet (Never)");
-  (let final Never #t3 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.field = 42;
+  (let final Never #t3 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}field = 42;
   core::print("DynamicSet (Invalid)");
   invalid-expression "pkg/front_end/testcases/none/property_set.dart:29:27: Error: Too few positional arguments: 1 required, 0 given.
   nonNullableClass1.method().field = 42;
-                          ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.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'.
  - '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;
-                    ^^^^^^^^^^" in nonNullableClass1{<unresolved>}.unresolved = 42;
+                    ^^^^^^^^^^" in nonNullableClass1.{<unresolved>}unresolved = 42;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/none/property_set.dart.weak.transformed.expect b/pkg/front_end/testcases/none/property_set.dart.weak.transformed.expect
index 2f5d871e9f8..d1bc9e22653 100644
--- a/pkg/front_end/testcases/none/property_set.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/none/property_set.dart.weak.transformed.expect
@@ -47,22 +47,22 @@ static method test(self::Class1 nonNullableClass1, self::Class1? nullableClass1,
   const int set_instance_field = nonNullableClass1.field = 42;
                                                          ^";
   core::print("DynamicSet");
-  dyn{dynamic}.field = 42;
-  let final dynamic #t2 = dyn in #t2 == null ?{core::int?} null : #t2{dynamic}.field = 42;
+  dyn.{dynamic}field = 42;
+  let final dynamic #t2 = dyn in #t2 == null ?{core::int?} null : #t2.{dynamic}field = 42;
   const core::int set_dynamic_field = invalid-expression "pkg/front_end/testcases/none/property_set.dart:23:43: Error: Not a constant expression.
   const int set_dynamic_field = dyn.field = 42;
                                           ^";
   core::print("DynamicSet (Never)");
-  (let final Never #t3 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")){Never}.field = 42;
+  (let final Never #t3 = never in throw new _in::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.")).{Never}field = 42;
   core::print("DynamicSet (Invalid)");
   invalid-expression "pkg/front_end/testcases/none/property_set.dart:29:27: Error: Too few positional arguments: 1 required, 0 given.
   nonNullableClass1.method().field = 42;
-                          ^" in nonNullableClass1.{self::Class1::method}{<inapplicable>}.(){() → invalid-type}{<invalid>}.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'.
  - '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;
-                    ^^^^^^^^^^" in nonNullableClass1{<unresolved>}.unresolved = 42;
+                    ^^^^^^^^^^" in nonNullableClass1.{<unresolved>}unresolved = 42;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/rasta/cascades.dart.strong.expect b/pkg/front_end/testcases/rasta/cascades.dart.strong.expect
index 54042bef851..9eaf086a9fd 100644
--- a/pkg/front_end/testcases/rasta/cascades.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/cascades.dart.strong.expect
@@ -14,6 +14,6 @@ static method main() → dynamic {
   function f(dynamic x) → dynamic
     return x;
   let final self::A #t1 = a in block {
-    #t1.{self::A::add}(f){(dynamic) → dynamic}{dynamic}.call("WHAT");
+    #t1.{self::A::add}(f){(dynamic) → dynamic}{dynamic}("WHAT");
   } =>#t1;
 }
diff --git a/pkg/front_end/testcases/rasta/cascades.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/cascades.dart.strong.transformed.expect
index 54042bef851..9eaf086a9fd 100644
--- a/pkg/front_end/testcases/rasta/cascades.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/cascades.dart.strong.transformed.expect
@@ -14,6 +14,6 @@ static method main() → dynamic {
   function f(dynamic x) → dynamic
     return x;
   let final self::A #t1 = a in block {
-    #t1.{self::A::add}(f){(dynamic) → dynamic}{dynamic}.call("WHAT");
+    #t1.{self::A::add}(f){(dynamic) → dynamic}{dynamic}("WHAT");
   } =>#t1;
 }
diff --git a/pkg/front_end/testcases/rasta/cascades.dart.weak.expect b/pkg/front_end/testcases/rasta/cascades.dart.weak.expect
index 54042bef851..9eaf086a9fd 100644
--- a/pkg/front_end/testcases/rasta/cascades.dart.weak.expect
+++ b/pkg/front_end/testcases/rasta/cascades.dart.weak.expect
@@ -14,6 +14,6 @@ static method main() → dynamic {
   function f(dynamic x) → dynamic
     return x;
   let final self::A #t1 = a in block {
-    #t1.{self::A::add}(f){(dynamic) → dynamic}{dynamic}.call("WHAT");
+    #t1.{self::A::add}(f){(dynamic) → dynamic}{dynamic}("WHAT");
   } =>#t1;
 }
diff --git a/pkg/front_end/testcases/rasta/cascades.dart.weak.modular.expect b/pkg/front_end/testcases/rasta/cascades.dart.weak.modular.expect
index 54042bef851..9eaf086a9fd 100644
--- a/pkg/front_end/testcases/rasta/cascades.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/rasta/cascades.dart.weak.modular.expect
@@ -14,6 +14,6 @@ static method main() → dynamic {
   function f(dynamic x) → dynamic
     return x;
   let final self::A #t1 = a in block {
-    #t1.{self::A::add}(f){(dynamic) → dynamic}{dynamic}.call("WHAT");
+    #t1.{self::A::add}(f){(dynamic) → dynamic}{dynamic}("WHAT");
   } =>#t1;
 }
diff --git a/pkg/front_end/testcases/rasta/cascades.dart.weak.transformed.expect b/pkg/front_end/testcases/rasta/cascades.dart.weak.transformed.expect
index 54042bef851..9eaf086a9fd 100644
--- a/pkg/front_end/testcases/rasta/cascades.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/rasta/cascades.dart.weak.transformed.expect
@@ -14,6 +14,6 @@ static method main() → dynamic {
   function f(dynamic x) → dynamic
     return x;
   let final self::A #t1 = a in block {
-    #t1.{self::A::add}(f){(dynamic) → dynamic}{dynamic}.call("WHAT");
+    #t1.{self::A::add}(f){(dynamic) → dynamic}{dynamic}("WHAT");
   } =>#t1;
 }
diff --git a/pkg/front_end/testcases/rasta/static.dart.strong.expect b/pkg/front_end/testcases/rasta/static.dart.strong.expect
index ef693572b48..aea3578bbd4 100644
--- a/pkg/front_end/testcases/rasta/static.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/static.dart.strong.expect
@@ -286,14 +286,14 @@ Try correcting the name to the name of an existing method, or defining a method
                        ^" in self::Foo::staticField{<unresolved>}.call());
     self::Foo::staticFunction();
     self::use(self::Foo::staticFunction());
-    self::Foo::staticGetter{dynamic}.call();
-    self::use(self::Foo::staticGetter{dynamic}.call());
+    self::Foo::staticGetter{dynamic}();
+    self::use(self::Foo::staticGetter{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/static.dart:61:9: Error: Getter not found: 'staticSetter'.
     Foo.staticSetter();
-        ^^^^^^^^^^^^"{dynamic}.call();
+        ^^^^^^^^^^^^"{dynamic}();
     self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:62:13: Error: Getter not found: 'staticSetter'.
     use(Foo.staticSetter());
-            ^^^^^^^^^^^^"{dynamic}.call());
+            ^^^^^^^^^^^^"{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/static.dart:64:9: Error: Setter not found: 'staticConstant'.
     Foo.staticConstant = 87;
         ^^^^^^^^^^^^^^";
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 e2cc4a7196e..8742fd60b90 100644
--- a/pkg/front_end/testcases/rasta/static.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/static.dart.strong.transformed.expect
@@ -286,14 +286,14 @@ Try correcting the name to the name of an existing method, or defining a method
                        ^" in self::Foo::staticField{<unresolved>}.call());
     self::Foo::staticFunction();
     self::use(self::Foo::staticFunction());
-    self::Foo::staticGetter{dynamic}.call();
-    self::use(self::Foo::staticGetter{dynamic}.call());
+    self::Foo::staticGetter{dynamic}();
+    self::use(self::Foo::staticGetter{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/static.dart:61:9: Error: Getter not found: 'staticSetter'.
     Foo.staticSetter();
-        ^^^^^^^^^^^^"{dynamic}.call();
+        ^^^^^^^^^^^^"{dynamic}();
     self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:62:13: Error: Getter not found: 'staticSetter'.
     use(Foo.staticSetter());
-            ^^^^^^^^^^^^"{dynamic}.call());
+            ^^^^^^^^^^^^"{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/static.dart:64:9: Error: Setter not found: 'staticConstant'.
     Foo.staticConstant = 87;
         ^^^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/rasta/static.dart.weak.expect b/pkg/front_end/testcases/rasta/static.dart.weak.expect
index ef693572b48..aea3578bbd4 100644
--- a/pkg/front_end/testcases/rasta/static.dart.weak.expect
+++ b/pkg/front_end/testcases/rasta/static.dart.weak.expect
@@ -286,14 +286,14 @@ Try correcting the name to the name of an existing method, or defining a method
                        ^" in self::Foo::staticField{<unresolved>}.call());
     self::Foo::staticFunction();
     self::use(self::Foo::staticFunction());
-    self::Foo::staticGetter{dynamic}.call();
-    self::use(self::Foo::staticGetter{dynamic}.call());
+    self::Foo::staticGetter{dynamic}();
+    self::use(self::Foo::staticGetter{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/static.dart:61:9: Error: Getter not found: 'staticSetter'.
     Foo.staticSetter();
-        ^^^^^^^^^^^^"{dynamic}.call();
+        ^^^^^^^^^^^^"{dynamic}();
     self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:62:13: Error: Getter not found: 'staticSetter'.
     use(Foo.staticSetter());
-            ^^^^^^^^^^^^"{dynamic}.call());
+            ^^^^^^^^^^^^"{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/static.dart:64:9: Error: Setter not found: 'staticConstant'.
     Foo.staticConstant = 87;
         ^^^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/rasta/static.dart.weak.modular.expect b/pkg/front_end/testcases/rasta/static.dart.weak.modular.expect
index ef693572b48..aea3578bbd4 100644
--- a/pkg/front_end/testcases/rasta/static.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/rasta/static.dart.weak.modular.expect
@@ -286,14 +286,14 @@ Try correcting the name to the name of an existing method, or defining a method
                        ^" in self::Foo::staticField{<unresolved>}.call());
     self::Foo::staticFunction();
     self::use(self::Foo::staticFunction());
-    self::Foo::staticGetter{dynamic}.call();
-    self::use(self::Foo::staticGetter{dynamic}.call());
+    self::Foo::staticGetter{dynamic}();
+    self::use(self::Foo::staticGetter{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/static.dart:61:9: Error: Getter not found: 'staticSetter'.
     Foo.staticSetter();
-        ^^^^^^^^^^^^"{dynamic}.call();
+        ^^^^^^^^^^^^"{dynamic}();
     self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:62:13: Error: Getter not found: 'staticSetter'.
     use(Foo.staticSetter());
-            ^^^^^^^^^^^^"{dynamic}.call());
+            ^^^^^^^^^^^^"{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/static.dart:64:9: Error: Setter not found: 'staticConstant'.
     Foo.staticConstant = 87;
         ^^^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/rasta/static.dart.weak.transformed.expect b/pkg/front_end/testcases/rasta/static.dart.weak.transformed.expect
index e2cc4a7196e..8742fd60b90 100644
--- a/pkg/front_end/testcases/rasta/static.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/rasta/static.dart.weak.transformed.expect
@@ -286,14 +286,14 @@ Try correcting the name to the name of an existing method, or defining a method
                        ^" in self::Foo::staticField{<unresolved>}.call());
     self::Foo::staticFunction();
     self::use(self::Foo::staticFunction());
-    self::Foo::staticGetter{dynamic}.call();
-    self::use(self::Foo::staticGetter{dynamic}.call());
+    self::Foo::staticGetter{dynamic}();
+    self::use(self::Foo::staticGetter{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/static.dart:61:9: Error: Getter not found: 'staticSetter'.
     Foo.staticSetter();
-        ^^^^^^^^^^^^"{dynamic}.call();
+        ^^^^^^^^^^^^"{dynamic}();
     self::use(invalid-expression "pkg/front_end/testcases/rasta/static.dart:62:13: Error: Getter not found: 'staticSetter'.
     use(Foo.staticSetter());
-            ^^^^^^^^^^^^"{dynamic}.call());
+            ^^^^^^^^^^^^"{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/static.dart:64:9: Error: Setter not found: 'staticConstant'.
     Foo.staticConstant = 87;
         ^^^^^^^^^^^^^^";
diff --git a/pkg/front_end/testcases/rasta/super.dart.strong.expect b/pkg/front_end/testcases/rasta/super.dart.strong.expect
index 80776bbd795..7e7f43d4295 100644
--- a/pkg/front_end/testcases/rasta/super.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/super.dart.strong.expect
@@ -507,30 +507,30 @@ Try correcting the operator to an existing operator, or defining a '+' operator.
 Try correcting the operator to an existing operator, or defining a '+' operator.
     use(++super.n);
         ^" in super.{self::A::n}{<unresolved>}.+(1));
-    super.{self::A::a}{dynamic}.call();
-    self::use(super.{self::A::a}{dynamic}.call());
-    super.{self::B::b}{dynamic}.call();
-    self::use(super.{self::B::b}{dynamic}.call());
-    super.{self::A::c}{dynamic}.call();
-    self::use(super.{self::A::c}{dynamic}.call());
-    super.{self::B::d}{dynamic}.call();
-    self::use(super.{self::B::d}{dynamic}.call());
-    super.{self::A::e}{dynamic}.call();
-    self::use(super.{self::A::e}{dynamic}.call());
-    super.{self::A::f}{dynamic}.call();
-    self::use(super.{self::A::f}{dynamic}.call());
+    super.{self::A::a}{dynamic}();
+    self::use(super.{self::A::a}{dynamic}());
+    super.{self::B::b}{dynamic}();
+    self::use(super.{self::B::b}{dynamic}());
+    super.{self::A::c}{dynamic}();
+    self::use(super.{self::A::c}{dynamic}());
+    super.{self::B::d}{dynamic}();
+    self::use(super.{self::B::d}{dynamic}());
+    super.{self::A::e}{dynamic}();
+    self::use(super.{self::A::e}{dynamic}());
+    super.{self::A::f}{dynamic}();
+    self::use(super.{self::A::f}{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/super.dart:137:11: Error: Superclass has no method named 'g'.
     super.g();
           ^";
     self::use(invalid-expression "pkg/front_end/testcases/rasta/super.dart:138:15: Error: Superclass has no method named 'g'.
     use(super.g());
               ^");
-    super.{self::A::h}{dynamic}.call();
-    self::use(super.{self::A::h}{dynamic}.call());
-    super.{self::A::i}{dynamic}.call();
-    self::use(super.{self::A::i}{dynamic}.call());
-    super.{self::A::[]}(87){dynamic}.call();
-    self::use(super.{self::A::[]}(87){dynamic}.call());
+    super.{self::A::h}{dynamic}();
+    self::use(super.{self::A::h}{dynamic}());
+    super.{self::A::i}{dynamic}();
+    self::use(super.{self::A::i}{dynamic}());
+    super.{self::A::[]}(87){dynamic}();
+    self::use(super.{self::A::[]}(87){dynamic}());
     super.{self::A::m}();
     self::use(invalid-expression "pkg/front_end/testcases/rasta/super.dart:146:15: Error: This expression has type 'void' and can't be used.
     use(super.m());
diff --git a/pkg/front_end/testcases/rasta/super.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/super.dart.strong.transformed.expect
index 70bd54ef714..bf18a462845 100644
--- a/pkg/front_end/testcases/rasta/super.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/super.dart.strong.transformed.expect
@@ -507,30 +507,30 @@ Try correcting the operator to an existing operator, or defining a '+' operator.
 Try correcting the operator to an existing operator, or defining a '+' operator.
     use(++super.n);
         ^" in super.{self::A::n}{<unresolved>}.+(1));
-    super.{self::A::a}{dynamic}.call();
-    self::use(super.{self::A::a}{dynamic}.call());
-    super.{self::B::b}{dynamic}.call();
-    self::use(super.{self::B::b}{dynamic}.call());
-    super.{self::A::c}{dynamic}.call();
-    self::use(super.{self::A::c}{dynamic}.call());
-    super.{self::B::d}{dynamic}.call();
-    self::use(super.{self::B::d}{dynamic}.call());
-    super.{self::A::e}{dynamic}.call();
-    self::use(super.{self::A::e}{dynamic}.call());
-    super.{self::A::f}{dynamic}.call();
-    self::use(super.{self::A::f}{dynamic}.call());
+    super.{self::A::a}{dynamic}();
+    self::use(super.{self::A::a}{dynamic}());
+    super.{self::B::b}{dynamic}();
+    self::use(super.{self::B::b}{dynamic}());
+    super.{self::A::c}{dynamic}();
+    self::use(super.{self::A::c}{dynamic}());
+    super.{self::B::d}{dynamic}();
+    self::use(super.{self::B::d}{dynamic}());
+    super.{self::A::e}{dynamic}();
+    self::use(super.{self::A::e}{dynamic}());
+    super.{self::A::f}{dynamic}();
+    self::use(super.{self::A::f}{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/super.dart:137:11: Error: Superclass has no method named 'g'.
     super.g();
           ^";
     self::use(invalid-expression "pkg/front_end/testcases/rasta/super.dart:138:15: Error: Superclass has no method named 'g'.
     use(super.g());
               ^");
-    super.{self::A::h}{dynamic}.call();
-    self::use(super.{self::A::h}{dynamic}.call());
-    super.{self::A::i}{dynamic}.call();
-    self::use(super.{self::A::i}{dynamic}.call());
-    super.{self::A::[]}(87){dynamic}.call();
-    self::use(super.{self::A::[]}(87){dynamic}.call());
+    super.{self::A::h}{dynamic}();
+    self::use(super.{self::A::h}{dynamic}());
+    super.{self::A::i}{dynamic}();
+    self::use(super.{self::A::i}{dynamic}());
+    super.{self::A::[]}(87){dynamic}();
+    self::use(super.{self::A::[]}(87){dynamic}());
     super.{self::A::m}();
     self::use(invalid-expression "pkg/front_end/testcases/rasta/super.dart:146:15: Error: This expression has type 'void' and can't be used.
     use(super.m());
diff --git a/pkg/front_end/testcases/rasta/super.dart.weak.expect b/pkg/front_end/testcases/rasta/super.dart.weak.expect
index 80776bbd795..7e7f43d4295 100644
--- a/pkg/front_end/testcases/rasta/super.dart.weak.expect
+++ b/pkg/front_end/testcases/rasta/super.dart.weak.expect
@@ -507,30 +507,30 @@ Try correcting the operator to an existing operator, or defining a '+' operator.
 Try correcting the operator to an existing operator, or defining a '+' operator.
     use(++super.n);
         ^" in super.{self::A::n}{<unresolved>}.+(1));
-    super.{self::A::a}{dynamic}.call();
-    self::use(super.{self::A::a}{dynamic}.call());
-    super.{self::B::b}{dynamic}.call();
-    self::use(super.{self::B::b}{dynamic}.call());
-    super.{self::A::c}{dynamic}.call();
-    self::use(super.{self::A::c}{dynamic}.call());
-    super.{self::B::d}{dynamic}.call();
-    self::use(super.{self::B::d}{dynamic}.call());
-    super.{self::A::e}{dynamic}.call();
-    self::use(super.{self::A::e}{dynamic}.call());
-    super.{self::A::f}{dynamic}.call();
-    self::use(super.{self::A::f}{dynamic}.call());
+    super.{self::A::a}{dynamic}();
+    self::use(super.{self::A::a}{dynamic}());
+    super.{self::B::b}{dynamic}();
+    self::use(super.{self::B::b}{dynamic}());
+    super.{self::A::c}{dynamic}();
+    self::use(super.{self::A::c}{dynamic}());
+    super.{self::B::d}{dynamic}();
+    self::use(super.{self::B::d}{dynamic}());
+    super.{self::A::e}{dynamic}();
+    self::use(super.{self::A::e}{dynamic}());
+    super.{self::A::f}{dynamic}();
+    self::use(super.{self::A::f}{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/super.dart:137:11: Error: Superclass has no method named 'g'.
     super.g();
           ^";
     self::use(invalid-expression "pkg/front_end/testcases/rasta/super.dart:138:15: Error: Superclass has no method named 'g'.
     use(super.g());
               ^");
-    super.{self::A::h}{dynamic}.call();
-    self::use(super.{self::A::h}{dynamic}.call());
-    super.{self::A::i}{dynamic}.call();
-    self::use(super.{self::A::i}{dynamic}.call());
-    super.{self::A::[]}(87){dynamic}.call();
-    self::use(super.{self::A::[]}(87){dynamic}.call());
+    super.{self::A::h}{dynamic}();
+    self::use(super.{self::A::h}{dynamic}());
+    super.{self::A::i}{dynamic}();
+    self::use(super.{self::A::i}{dynamic}());
+    super.{self::A::[]}(87){dynamic}();
+    self::use(super.{self::A::[]}(87){dynamic}());
     super.{self::A::m}();
     self::use(invalid-expression "pkg/front_end/testcases/rasta/super.dart:146:15: Error: This expression has type 'void' and can't be used.
     use(super.m());
diff --git a/pkg/front_end/testcases/rasta/super.dart.weak.modular.expect b/pkg/front_end/testcases/rasta/super.dart.weak.modular.expect
index 80776bbd795..7e7f43d4295 100644
--- a/pkg/front_end/testcases/rasta/super.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/rasta/super.dart.weak.modular.expect
@@ -507,30 +507,30 @@ Try correcting the operator to an existing operator, or defining a '+' operator.
 Try correcting the operator to an existing operator, or defining a '+' operator.
     use(++super.n);
         ^" in super.{self::A::n}{<unresolved>}.+(1));
-    super.{self::A::a}{dynamic}.call();
-    self::use(super.{self::A::a}{dynamic}.call());
-    super.{self::B::b}{dynamic}.call();
-    self::use(super.{self::B::b}{dynamic}.call());
-    super.{self::A::c}{dynamic}.call();
-    self::use(super.{self::A::c}{dynamic}.call());
-    super.{self::B::d}{dynamic}.call();
-    self::use(super.{self::B::d}{dynamic}.call());
-    super.{self::A::e}{dynamic}.call();
-    self::use(super.{self::A::e}{dynamic}.call());
-    super.{self::A::f}{dynamic}.call();
-    self::use(super.{self::A::f}{dynamic}.call());
+    super.{self::A::a}{dynamic}();
+    self::use(super.{self::A::a}{dynamic}());
+    super.{self::B::b}{dynamic}();
+    self::use(super.{self::B::b}{dynamic}());
+    super.{self::A::c}{dynamic}();
+    self::use(super.{self::A::c}{dynamic}());
+    super.{self::B::d}{dynamic}();
+    self::use(super.{self::B::d}{dynamic}());
+    super.{self::A::e}{dynamic}();
+    self::use(super.{self::A::e}{dynamic}());
+    super.{self::A::f}{dynamic}();
+    self::use(super.{self::A::f}{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/super.dart:137:11: Error: Superclass has no method named 'g'.
     super.g();
           ^";
     self::use(invalid-expression "pkg/front_end/testcases/rasta/super.dart:138:15: Error: Superclass has no method named 'g'.
     use(super.g());
               ^");
-    super.{self::A::h}{dynamic}.call();
-    self::use(super.{self::A::h}{dynamic}.call());
-    super.{self::A::i}{dynamic}.call();
-    self::use(super.{self::A::i}{dynamic}.call());
-    super.{self::A::[]}(87){dynamic}.call();
-    self::use(super.{self::A::[]}(87){dynamic}.call());
+    super.{self::A::h}{dynamic}();
+    self::use(super.{self::A::h}{dynamic}());
+    super.{self::A::i}{dynamic}();
+    self::use(super.{self::A::i}{dynamic}());
+    super.{self::A::[]}(87){dynamic}();
+    self::use(super.{self::A::[]}(87){dynamic}());
     super.{self::A::m}();
     self::use(invalid-expression "pkg/front_end/testcases/rasta/super.dart:146:15: Error: This expression has type 'void' and can't be used.
     use(super.m());
diff --git a/pkg/front_end/testcases/rasta/super.dart.weak.transformed.expect b/pkg/front_end/testcases/rasta/super.dart.weak.transformed.expect
index 70bd54ef714..bf18a462845 100644
--- a/pkg/front_end/testcases/rasta/super.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/rasta/super.dart.weak.transformed.expect
@@ -507,30 +507,30 @@ Try correcting the operator to an existing operator, or defining a '+' operator.
 Try correcting the operator to an existing operator, or defining a '+' operator.
     use(++super.n);
         ^" in super.{self::A::n}{<unresolved>}.+(1));
-    super.{self::A::a}{dynamic}.call();
-    self::use(super.{self::A::a}{dynamic}.call());
-    super.{self::B::b}{dynamic}.call();
-    self::use(super.{self::B::b}{dynamic}.call());
-    super.{self::A::c}{dynamic}.call();
-    self::use(super.{self::A::c}{dynamic}.call());
-    super.{self::B::d}{dynamic}.call();
-    self::use(super.{self::B::d}{dynamic}.call());
-    super.{self::A::e}{dynamic}.call();
-    self::use(super.{self::A::e}{dynamic}.call());
-    super.{self::A::f}{dynamic}.call();
-    self::use(super.{self::A::f}{dynamic}.call());
+    super.{self::A::a}{dynamic}();
+    self::use(super.{self::A::a}{dynamic}());
+    super.{self::B::b}{dynamic}();
+    self::use(super.{self::B::b}{dynamic}());
+    super.{self::A::c}{dynamic}();
+    self::use(super.{self::A::c}{dynamic}());
+    super.{self::B::d}{dynamic}();
+    self::use(super.{self::B::d}{dynamic}());
+    super.{self::A::e}{dynamic}();
+    self::use(super.{self::A::e}{dynamic}());
+    super.{self::A::f}{dynamic}();
+    self::use(super.{self::A::f}{dynamic}());
     invalid-expression "pkg/front_end/testcases/rasta/super.dart:137:11: Error: Superclass has no method named 'g'.
     super.g();
           ^";
     self::use(invalid-expression "pkg/front_end/testcases/rasta/super.dart:138:15: Error: Superclass has no method named 'g'.
     use(super.g());
               ^");
-    super.{self::A::h}{dynamic}.call();
-    self::use(super.{self::A::h}{dynamic}.call());
-    super.{self::A::i}{dynamic}.call();
-    self::use(super.{self::A::i}{dynamic}.call());
-    super.{self::A::[]}(87){dynamic}.call();
-    self::use(super.{self::A::[]}(87){dynamic}.call());
+    super.{self::A::h}{dynamic}();
+    self::use(super.{self::A::h}{dynamic}());
+    super.{self::A::i}{dynamic}();
+    self::use(super.{self::A::i}{dynamic}());
+    super.{self::A::[]}(87){dynamic}();
+    self::use(super.{self::A::[]}(87){dynamic}());
     super.{self::A::m}();
     self::use(invalid-expression "pkg/front_end/testcases/rasta/super.dart:146:15: Error: This expression has type 'void' and can't be used.
     use(super.m());
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 1310f33de69..ac9f87461a3 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
@@ -98,7 +98,7 @@ class Fisk extends core::Object {
  - '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 class '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) {
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 7698db905e0..e447f64a45e 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
@@ -102,7 +102,7 @@ class Fisk extends core::Object {
  - '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 class '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) {
diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.expect
index c4b5ddd93e3..e4522b36a27 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.expect
@@ -98,7 +98,7 @@ class Fisk extends core::Object {
  - '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 class '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) {
diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.modular.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.modular.expect
index c4b5ddd93e3..e4522b36a27 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.modular.expect
@@ -98,7 +98,7 @@ class Fisk extends core::Object {
  - '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 class '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) {
diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.transformed.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.transformed.expect
index dd49fdaba08..af261254bc9 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.weak.transformed.expect
@@ -102,7 +102,7 @@ class Fisk extends core::Object {
  - '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 class '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) {
diff --git a/pkg/front_end/testcases/records/issue50157.dart.strong.expect b/pkg/front_end/testcases/records/issue50157.dart.strong.expect
index ebdcf053cf0..dc78132afd4 100644
--- a/pkg/front_end/testcases/records/issue50157.dart.strong.expect
+++ b/pkg/front_end/testcases/records/issue50157.dart.strong.expect
@@ -38,10 +38,10 @@ static method test(self::A a, ({required foo: core::int}) r) → dynamic {
  - '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;
+    ^^^" 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})'.
 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;
+    ^^^" 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 ebdcf053cf0..dc78132afd4 100644
--- a/pkg/front_end/testcases/records/issue50157.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/records/issue50157.dart.strong.transformed.expect
@@ -38,10 +38,10 @@ static method test(self::A a, ({required foo: core::int}) r) → dynamic {
  - '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;
+    ^^^" 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})'.
 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;
+    ^^^" in r.{<unresolved>}foo = 2;
 }
diff --git a/pkg/front_end/testcases/records/issue50157.dart.weak.expect b/pkg/front_end/testcases/records/issue50157.dart.weak.expect
index ebdcf053cf0..dc78132afd4 100644
--- a/pkg/front_end/testcases/records/issue50157.dart.weak.expect
+++ b/pkg/front_end/testcases/records/issue50157.dart.weak.expect
@@ -38,10 +38,10 @@ static method test(self::A a, ({required foo: core::int}) r) → dynamic {
  - '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;
+    ^^^" 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})'.
 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;
+    ^^^" in r.{<unresolved>}foo = 2;
 }
diff --git a/pkg/front_end/testcases/records/issue50157.dart.weak.modular.expect b/pkg/front_end/testcases/records/issue50157.dart.weak.modular.expect
index ebdcf053cf0..dc78132afd4 100644
--- a/pkg/front_end/testcases/records/issue50157.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/records/issue50157.dart.weak.modular.expect
@@ -38,10 +38,10 @@ static method test(self::A a, ({required foo: core::int}) r) → dynamic {
  - '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;
+    ^^^" 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})'.
 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;
+    ^^^" in r.{<unresolved>}foo = 2;
 }
diff --git a/pkg/front_end/testcases/records/issue50157.dart.weak.transformed.expect b/pkg/front_end/testcases/records/issue50157.dart.weak.transformed.expect
index ebdcf053cf0..dc78132afd4 100644
--- a/pkg/front_end/testcases/records/issue50157.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/records/issue50157.dart.weak.transformed.expect
@@ -38,10 +38,10 @@ static method test(self::A a, ({required foo: core::int}) r) → dynamic {
  - '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;
+    ^^^" 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})'.
 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;
+    ^^^" in r.{<unresolved>}foo = 2;
 }
diff --git a/pkg/front_end/testcases/regress/issue_29979.dart.strong.expect b/pkg/front_end/testcases/regress/issue_29979.dart.strong.expect
index 9b95ad05695..1c578b7335e 100644
--- a/pkg/front_end/testcases/regress/issue_29979.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_29979.dart.strong.expect
@@ -13,5 +13,5 @@ static method test() → dynamic {
     function f() → Null {}
   } =>invalid-expression "pkg/front_end/testcases/regress/issue_29979.dart:6:4: Error: A function expression can't have a name.
   (f() {})();
-   ^"){dynamic}.call();
+   ^"){dynamic}();
 }
diff --git a/pkg/front_end/testcases/regress/issue_29979.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_29979.dart.strong.transformed.expect
index 9b95ad05695..1c578b7335e 100644
--- a/pkg/front_end/testcases/regress/issue_29979.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_29979.dart.strong.transformed.expect
@@ -13,5 +13,5 @@ static method test() → dynamic {
     function f() → Null {}
   } =>invalid-expression "pkg/front_end/testcases/regress/issue_29979.dart:6:4: Error: A function expression can't have a name.
   (f() {})();
-   ^"){dynamic}.call();
+   ^"){dynamic}();
 }
diff --git a/pkg/front_end/testcases/regress/issue_29979.dart.weak.expect b/pkg/front_end/testcases/regress/issue_29979.dart.weak.expect
index 9b95ad05695..1c578b7335e 100644
--- a/pkg/front_end/testcases/regress/issue_29979.dart.weak.expect
+++ b/pkg/front_end/testcases/regress/issue_29979.dart.weak.expect
@@ -13,5 +13,5 @@ static method test() → dynamic {
     function f() → Null {}
   } =>invalid-expression "pkg/front_end/testcases/regress/issue_29979.dart:6:4: Error: A function expression can't have a name.
   (f() {})();
-   ^"){dynamic}.call();
+   ^"){dynamic}();
 }
diff --git a/pkg/front_end/testcases/regress/issue_29979.dart.weak.modular.expect b/pkg/front_end/testcases/regress/issue_29979.dart.weak.modular.expect
index 9b95ad05695..1c578b7335e 100644
--- a/pkg/front_end/testcases/regress/issue_29979.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/regress/issue_29979.dart.weak.modular.expect
@@ -13,5 +13,5 @@ static method test() → dynamic {
     function f() → Null {}
   } =>invalid-expression "pkg/front_end/testcases/regress/issue_29979.dart:6:4: Error: A function expression can't have a name.
   (f() {})();
-   ^"){dynamic}.call();
+   ^"){dynamic}();
 }
diff --git a/pkg/front_end/testcases/regress/issue_29979.dart.weak.transformed.expect b/pkg/front_end/testcases/regress/issue_29979.dart.weak.transformed.expect
index 9b95ad05695..1c578b7335e 100644
--- a/pkg/front_end/testcases/regress/issue_29979.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_29979.dart.weak.transformed.expect
@@ -13,5 +13,5 @@ static method test() → dynamic {
     function f() → Null {}
   } =>invalid-expression "pkg/front_end/testcases/regress/issue_29979.dart:6:4: Error: A function expression can't have a name.
   (f() {})();
-   ^"){dynamic}.call();
+   ^"){dynamic}();
 }
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 593f3f42787..10f66fbeb1e 100644
--- a/pkg/front_end/testcases/regress/issue_34225.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_34225.dart.strong.expect
@@ -39,7 +39,7 @@ static method main() → dynamic {
  - '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;
-    ^" in c{<unresolved>}.C = 5;
+    ^" in c.{<unresolved>}C = 5;
   self::D d = new self::D::•();
   d.{self::D::D} = 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 593f3f42787..10f66fbeb1e 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
@@ -39,7 +39,7 @@ static method main() → dynamic {
  - '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;
-    ^" in c{<unresolved>}.C = 5;
+    ^" in c.{<unresolved>}C = 5;
   self::D d = new self::D::•();
   d.{self::D::D} = 5;
 }
diff --git a/pkg/front_end/testcases/regress/issue_34225.dart.weak.expect b/pkg/front_end/testcases/regress/issue_34225.dart.weak.expect
index 593f3f42787..10f66fbeb1e 100644
--- a/pkg/front_end/testcases/regress/issue_34225.dart.weak.expect
+++ b/pkg/front_end/testcases/regress/issue_34225.dart.weak.expect
@@ -39,7 +39,7 @@ static method main() → dynamic {
  - '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;
-    ^" in c{<unresolved>}.C = 5;
+    ^" in c.{<unresolved>}C = 5;
   self::D d = new self::D::•();
   d.{self::D::D} = 5;
 }
diff --git a/pkg/front_end/testcases/regress/issue_34225.dart.weak.modular.expect b/pkg/front_end/testcases/regress/issue_34225.dart.weak.modular.expect
index 593f3f42787..10f66fbeb1e 100644
--- a/pkg/front_end/testcases/regress/issue_34225.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/regress/issue_34225.dart.weak.modular.expect
@@ -39,7 +39,7 @@ static method main() → dynamic {
  - '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;
-    ^" in c{<unresolved>}.C = 5;
+    ^" in c.{<unresolved>}C = 5;
   self::D d = new self::D::•();
   d.{self::D::D} = 5;
 }
diff --git a/pkg/front_end/testcases/regress/issue_34225.dart.weak.transformed.expect b/pkg/front_end/testcases/regress/issue_34225.dart.weak.transformed.expect
index 593f3f42787..10f66fbeb1e 100644
--- a/pkg/front_end/testcases/regress/issue_34225.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34225.dart.weak.transformed.expect
@@ -39,7 +39,7 @@ static method main() → dynamic {
  - '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;
-    ^" in c{<unresolved>}.C = 5;
+    ^" in c.{<unresolved>}C = 5;
   self::D d = new self::D::•();
   d.{self::D::D} = 5;
 }
diff --git a/pkg/front_end/testcases/regress/issue_35177.dart.strong.expect b/pkg/front_end/testcases/regress/issue_35177.dart.strong.expect
index aa32d1f6b5e..2f184cfb51e 100644
--- a/pkg/front_end/testcases/regress/issue_35177.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_35177.dart.strong.expect
@@ -4,5 +4,5 @@ import "dart:core" as core;
 
 static method test() → dynamic {
   () → dynamic f = () → Null {};
-  f(){() → dynamic}{dynamic}.call<core::int>();
+  f(){() → dynamic}{dynamic}<core::int>();
 }
diff --git a/pkg/front_end/testcases/regress/issue_35177.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_35177.dart.strong.transformed.expect
index aa32d1f6b5e..2f184cfb51e 100644
--- a/pkg/front_end/testcases/regress/issue_35177.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_35177.dart.strong.transformed.expect
@@ -4,5 +4,5 @@ import "dart:core" as core;
 
 static method test() → dynamic {
   () → dynamic f = () → Null {};
-  f(){() → dynamic}{dynamic}.call<core::int>();
+  f(){() → dynamic}{dynamic}<core::int>();
 }
diff --git a/pkg/front_end/testcases/regress/issue_35177.dart.weak.expect b/pkg/front_end/testcases/regress/issue_35177.dart.weak.expect
index aa32d1f6b5e..2f184cfb51e 100644
--- a/pkg/front_end/testcases/regress/issue_35177.dart.weak.expect
+++ b/pkg/front_end/testcases/regress/issue_35177.dart.weak.expect
@@ -4,5 +4,5 @@ import "dart:core" as core;
 
 static method test() → dynamic {
   () → dynamic f = () → Null {};
-  f(){() → dynamic}{dynamic}.call<core::int>();
+  f(){() → dynamic}{dynamic}<core::int>();
 }
diff --git a/pkg/front_end/testcases/regress/issue_35177.dart.weak.modular.expect b/pkg/front_end/testcases/regress/issue_35177.dart.weak.modular.expect
index aa32d1f6b5e..2f184cfb51e 100644
--- a/pkg/front_end/testcases/regress/issue_35177.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/regress/issue_35177.dart.weak.modular.expect
@@ -4,5 +4,5 @@ import "dart:core" as core;
 
 static method test() → dynamic {
   () → dynamic f = () → Null {};
-  f(){() → dynamic}{dynamic}.call<core::int>();
+  f(){() → dynamic}{dynamic}<core::int>();
 }
diff --git a/pkg/front_end/testcases/regress/issue_35177.dart.weak.transformed.expect b/pkg/front_end/testcases/regress/issue_35177.dart.weak.transformed.expect
index aa32d1f6b5e..2f184cfb51e 100644
--- a/pkg/front_end/testcases/regress/issue_35177.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_35177.dart.weak.transformed.expect
@@ -4,5 +4,5 @@ import "dart:core" as core;
 
 static method test() → dynamic {
   () → dynamic f = () → Null {};
-  f(){() → dynamic}{dynamic}.call<core::int>();
+  f(){() → dynamic}{dynamic}<core::int>();
 }
diff --git a/pkg/front_end/testcases/runtime_checks/call_kinds.dart.strong.expect b/pkg/front_end/testcases/runtime_checks/call_kinds.dart.strong.expect
index 8bbc0af8128..437f376aec6 100644
--- a/pkg/front_end/testcases/runtime_checks/call_kinds.dart.strong.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_kinds.dart.strong.expect
@@ -17,16 +17,16 @@ class C extends core::Object {
     this.{self::C::f}(){() → void};
     this.{self::C::g}{() → void}(){() → void};
     this.{self::C::g}{() → void}(){() → void};
-    this.{self::C::h}{dynamic}{dynamic}.call();
-    this.{self::C::h}{dynamic}{dynamic}.call();
+    this.{self::C::h}{dynamic}{dynamic}();
+    this.{self::C::h}{dynamic}{dynamic}();
   }
 }
 static method test(self::C c, () → void f, dynamic d) → void {
   c.{self::C::f}(){() → void};
   f(){() → void};
-  d{dynamic}.call();
+  d{dynamic}();
   d{dynamic}.f();
   c.{self::C::g}{() → void}(){() → void};
-  c.{self::C::h}{dynamic}{dynamic}.call();
+  c.{self::C::h}{dynamic}{dynamic}();
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/runtime_checks/call_kinds.dart.strong.transformed.expect b/pkg/front_end/testcases/runtime_checks/call_kinds.dart.strong.transformed.expect
index 8bbc0af8128..437f376aec6 100644
--- a/pkg/front_end/testcases/runtime_checks/call_kinds.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_kinds.dart.strong.transformed.expect
@@ -17,16 +17,16 @@ class C extends core::Object {
     this.{self::C::f}(){() → void};
     this.{self::C::g}{() → void}(){() → void};
     this.{self::C::g}{() → void}(){() → void};
-    this.{self::C::h}{dynamic}{dynamic}.call();
-    this.{self::C::h}{dynamic}{dynamic}.call();
+    this.{self::C::h}{dynamic}{dynamic}();
+    this.{self::C::h}{dynamic}{dynamic}();
   }
 }
 static method test(self::C c, () → void f, dynamic d) → void {
   c.{self::C::f}(){() → void};
   f(){() → void};
-  d{dynamic}.call();
+  d{dynamic}();
   d{dynamic}.f();
   c.{self::C::g}{() → void}(){() → void};
-  c.{self::C::h}{dynamic}{dynamic}.call();
+  c.{self::C::h}{dynamic}{dynamic}();
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.expect b/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.expect
index 8bbc0af8128..437f376aec6 100644
--- a/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.expect
@@ -17,16 +17,16 @@ class C extends core::Object {
     this.{self::C::f}(){() → void};
     this.{self::C::g}{() → void}(){() → void};
     this.{self::C::g}{() → void}(){() → void};
-    this.{self::C::h}{dynamic}{dynamic}.call();
-    this.{self::C::h}{dynamic}{dynamic}.call();
+    this.{self::C::h}{dynamic}{dynamic}();
+    this.{self::C::h}{dynamic}{dynamic}();
   }
 }
 static method test(self::C c, () → void f, dynamic d) → void {
   c.{self::C::f}(){() → void};
   f(){() → void};
-  d{dynamic}.call();
+  d{dynamic}();
   d{dynamic}.f();
   c.{self::C::g}{() → void}(){() → void};
-  c.{self::C::h}{dynamic}{dynamic}.call();
+  c.{self::C::h}{dynamic}{dynamic}();
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.modular.expect b/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.modular.expect
index 8bbc0af8128..437f376aec6 100644
--- a/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.modular.expect
@@ -17,16 +17,16 @@ class C extends core::Object {
     this.{self::C::f}(){() → void};
     this.{self::C::g}{() → void}(){() → void};
     this.{self::C::g}{() → void}(){() → void};
-    this.{self::C::h}{dynamic}{dynamic}.call();
-    this.{self::C::h}{dynamic}{dynamic}.call();
+    this.{self::C::h}{dynamic}{dynamic}();
+    this.{self::C::h}{dynamic}{dynamic}();
   }
 }
 static method test(self::C c, () → void f, dynamic d) → void {
   c.{self::C::f}(){() → void};
   f(){() → void};
-  d{dynamic}.call();
+  d{dynamic}();
   d{dynamic}.f();
   c.{self::C::g}{() → void}(){() → void};
-  c.{self::C::h}{dynamic}{dynamic}.call();
+  c.{self::C::h}{dynamic}{dynamic}();
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.transformed.expect b/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.transformed.expect
index 8bbc0af8128..437f376aec6 100644
--- a/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_kinds.dart.weak.transformed.expect
@@ -17,16 +17,16 @@ class C extends core::Object {
     this.{self::C::f}(){() → void};
     this.{self::C::g}{() → void}(){() → void};
     this.{self::C::g}{() → void}(){() → void};
-    this.{self::C::h}{dynamic}{dynamic}.call();
-    this.{self::C::h}{dynamic}{dynamic}.call();
+    this.{self::C::h}{dynamic}{dynamic}();
+    this.{self::C::h}{dynamic}{dynamic}();
   }
 }
 static method test(self::C c, () → void f, dynamic d) → void {
   c.{self::C::f}(){() → void};
   f(){() → void};
-  d{dynamic}.call();
+  d{dynamic}();
   d{dynamic}.f();
   c.{self::C::g}{() → void}(){() → void};
-  c.{self::C::h}{dynamic}{dynamic}.call();
+  c.{self::C::h}{dynamic}{dynamic}();
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.strong.expect b/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.strong.expect
index fe574c071ee..40d0424699a 100644
--- a/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.strong.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.strong.expect
@@ -18,6 +18,6 @@ class C extends core::Object {
 static method test(self::C c, dynamic d) → void {
   c.{self::C::x} = null;
   c.{self::C::y} = null;
-  d{dynamic}.x = null;
+  d.{dynamic}x = null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.strong.transformed.expect b/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.strong.transformed.expect
index fe574c071ee..40d0424699a 100644
--- a/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.strong.transformed.expect
@@ -18,6 +18,6 @@ class C extends core::Object {
 static method test(self::C c, dynamic d) → void {
   c.{self::C::x} = null;
   c.{self::C::y} = null;
-  d{dynamic}.x = null;
+  d.{dynamic}x = null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.expect b/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.expect
index fe574c071ee..40d0424699a 100644
--- a/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.expect
@@ -18,6 +18,6 @@ class C extends core::Object {
 static method test(self::C c, dynamic d) → void {
   c.{self::C::x} = null;
   c.{self::C::y} = null;
-  d{dynamic}.x = null;
+  d.{dynamic}x = null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.modular.expect b/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.modular.expect
index fe574c071ee..40d0424699a 100644
--- a/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.modular.expect
@@ -18,6 +18,6 @@ class C extends core::Object {
 static method test(self::C c, dynamic d) → void {
   c.{self::C::x} = null;
   c.{self::C::y} = null;
-  d{dynamic}.x = null;
+  d.{dynamic}x = null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.transformed.expect b/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.transformed.expect
index fe574c071ee..40d0424699a 100644
--- a/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_kinds_set.dart.weak.transformed.expect
@@ -18,6 +18,6 @@ class C extends core::Object {
 static method test(self::C c, dynamic d) → void {
   c.{self::C::x} = null;
   c.{self::C::y} = null;
-  d{dynamic}.x = null;
+  d.{dynamic}x = null;
 }
 static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.strong.expect b/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.strong.expect
index f0553504b88..b7b463ab804 100644
--- a/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.strong.expect
+++ b/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.strong.expect
@@ -9,7 +9,7 @@ class C extends core::Object {
     ;
 }
 static method g(self::C c) → void {
-  let final self::C #t1 = c in let final core::double #t2 = 1.5 in #t1.{self::C::f}{dynamic}{dynamic}.call(#t2);
+  let final self::C #t1 = c in let final core::double #t2 = 1.5 in #t1.{self::C::f}{dynamic}{dynamic}(#t2);
 }
 static method h(core::int i) → void {}
 static method test() → void {
diff --git a/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.strong.transformed.expect b/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.strong.transformed.expect
index de9b440653e..8d1c7fa7d9f 100644
--- a/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.strong.transformed.expect
@@ -9,7 +9,7 @@ class C extends core::Object {
     ;
 }
 static method g(self::C c) → void {
-  let final self::C #t1 = c in let final core::double #t2 = 1.5 in #t1.{self::C::f}{dynamic}{dynamic}.call(#t2);
+  let final self::C #t1 = c in let final core::double #t2 = 1.5 in #t1.{self::C::f}{dynamic}{dynamic}(#t2);
 }
 static method h(core::int i) → void {}
 static method test() → void {
diff --git a/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.expect b/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.expect
index f0553504b88..b7b463ab804 100644
--- a/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.expect
+++ b/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.expect
@@ -9,7 +9,7 @@ class C extends core::Object {
     ;
 }
 static method g(self::C c) → void {
-  let final self::C #t1 = c in let final core::double #t2 = 1.5 in #t1.{self::C::f}{dynamic}{dynamic}.call(#t2);
+  let final self::C #t1 = c in let final core::double #t2 = 1.5 in #t1.{self::C::f}{dynamic}{dynamic}(#t2);
 }
 static method h(core::int i) → void {}
 static method test() → void {
diff --git a/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.modular.expect b/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.modular.expect
index f0553504b88..b7b463ab804 100644
--- a/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.modular.expect
@@ -9,7 +9,7 @@ class C extends core::Object {
     ;
 }
 static method g(self::C c) → void {
-  let final self::C #t1 = c in let final core::double #t2 = 1.5 in #t1.{self::C::f}{dynamic}{dynamic}.call(#t2);
+  let final self::C #t1 = c in let final core::double #t2 = 1.5 in #t1.{self::C::f}{dynamic}{dynamic}(#t2);
 }
 static method h(core::int i) → void {}
 static method test() → void {
diff --git a/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.transformed.expect b/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.transformed.expect
index de9b440653e..8d1c7fa7d9f 100644
--- a/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/runtime_checks/dynamic_invocation_of_getter.dart.weak.transformed.expect
@@ -9,7 +9,7 @@ class C extends core::Object {
     ;
 }
 static method g(self::C c) → void {
-  let final self::C #t1 = c in let final core::double #t2 = 1.5 in #t1.{self::C::f}{dynamic}{dynamic}.call(#t2);
+  let final self::C #t1 = c in let final core::double #t2 = 1.5 in #t1.{self::C::f}{dynamic}{dynamic}(#t2);
 }
 static method h(core::int i) → void {}
 static method test() → void {
diff --git a/pkg/kernel/binary.md b/pkg/kernel/binary.md
index 3b183bff585..3dfcf6dfc51 100644
--- a/pkg/kernel/binary.md
+++ b/pkg/kernel/binary.md
@@ -147,7 +147,7 @@ type CanonicalName {
 
 type ComponentFile {
   UInt32 magic = 0x90ABCDEF;
-  UInt32 formatVersion = 114;
+  UInt32 formatVersion = 115;
   Byte[10] shortSdkHash;
   List<String> problemsAsJson; // Described in problems.md.
   Library[] libraries;
@@ -807,6 +807,7 @@ type InstanceGetterInvocation extends Expression {
 type DynamicInvocation extends Expression {
   Byte tag = 124;
   Byte kind; // Index into DynamicAccessKind above.
+  Byte flags (isImplicitCall);
   FileOffset fileOffset;
   Expression receiver;
   Name name;
diff --git a/pkg/kernel/lib/ast.dart b/pkg/kernel/lib/ast.dart
index 8fede03329c..79c4dc394e7 100644
--- a/pkg/kernel/lib/ast.dart
+++ b/pkg/kernel/lib/ast.dart
@@ -5541,6 +5541,9 @@ abstract class InstanceInvocationExpression extends InvocationExpression {
 }
 
 class DynamicInvocation extends InstanceInvocationExpression {
+  // Must match serialized bit positions.
+  static const int FlagImplicitCall = 1 << 0;
+
   final DynamicAccessKind kind;
 
   @override
@@ -5552,11 +5555,25 @@ class DynamicInvocation extends InstanceInvocationExpression {
   @override
   Arguments arguments;
 
+  int flags = 0;
+
   DynamicInvocation(this.kind, this.receiver, this.name, this.arguments) {
     receiver.parent = this;
     arguments.parent = this;
   }
 
+  /// If `true` this is an implicit call to 'call'. For instance
+  ///
+  ///    method(dynamic d) {
+  ///      d(); // Implicit call.
+  ///      d.call(); // Explicit call.
+  ///
+  bool get isImplicitCall => flags & FlagImplicitCall != 0;
+
+  void set isImplicitCall(bool value) {
+    flags = value ? (flags | FlagImplicitCall) : (flags & ~FlagImplicitCall);
+  }
+
   @override
   DartType getStaticTypeInternal(StaticTypeContext context) {
     switch (kind) {
@@ -5609,8 +5626,10 @@ class DynamicInvocation extends InstanceInvocationExpression {
   void toTextInternal(AstPrinter printer) {
     printer.writeExpression(receiver,
         minimumPrecedence: astToText.Precedence.PRIMARY);
-    printer.write('.');
-    printer.writeName(name);
+    if (!isImplicitCall) {
+      printer.write('.');
+      printer.writeName(name);
+    }
     printer.writeArguments(arguments);
   }
 }
diff --git a/pkg/kernel/lib/binary/ast_from_binary.dart b/pkg/kernel/lib/binary/ast_from_binary.dart
index 5f4370d07a5..8f0b1080f9b 100644
--- a/pkg/kernel/lib/binary/ast_from_binary.dart
+++ b/pkg/kernel/lib/binary/ast_from_binary.dart
@@ -2557,10 +2557,12 @@ class BinaryBuilder {
 
   Expression _readDynamicInvocation() {
     DynamicAccessKind kind = DynamicAccessKind.values[readByte()];
+    int flags = readByte();
     int offset = readOffset();
     return new DynamicInvocation(
         kind, readExpression(), readName(), readArguments())
-      ..fileOffset = offset;
+      ..fileOffset = offset
+      ..flags = flags;
   }
 
   Expression _readFunctionInvocation() {
diff --git a/pkg/kernel/lib/binary/ast_to_binary.dart b/pkg/kernel/lib/binary/ast_to_binary.dart
index 29a025028e3..e0bcc4d7f1b 100644
--- a/pkg/kernel/lib/binary/ast_to_binary.dart
+++ b/pkg/kernel/lib/binary/ast_to_binary.dart
@@ -1768,6 +1768,7 @@ class BinaryPrinter implements Visitor<void>, BinarySink {
   void visitDynamicInvocation(DynamicInvocation node) {
     writeByte(Tag.DynamicInvocation);
     writeByte(node.kind.index);
+    writeByte(node.flags);
     writeOffset(node.fileOffset);
     writeNode(node.receiver);
     writeName(node.name);
diff --git a/pkg/kernel/lib/binary/tag.dart b/pkg/kernel/lib/binary/tag.dart
index 2acd31374c0..477c57dc685 100644
--- a/pkg/kernel/lib/binary/tag.dart
+++ b/pkg/kernel/lib/binary/tag.dart
@@ -226,7 +226,7 @@ class Tag {
   /// Internal version of kernel binary format.
   /// Bump it when making incompatible changes in kernel binaries.
   /// Keep in sync with runtime/vm/kernel_binary.h, pkg/kernel/binary.md.
-  static const int BinaryFormatVersion = 114;
+  static const int BinaryFormatVersion = 115;
 }
 
 abstract class ConstantTag {
diff --git a/pkg/kernel/lib/clone.dart b/pkg/kernel/lib/clone.dart
index ddf6eb8301a..7862456889c 100644
--- a/pkg/kernel/lib/clone.dart
+++ b/pkg/kernel/lib/clone.dart
@@ -751,7 +751,8 @@ class CloneVisitorNotMembers implements TreeVisitor<TreeNode> {
   @override
   TreeNode visitDynamicInvocation(DynamicInvocation node) {
     return new DynamicInvocation(
-        node.kind, clone(node.receiver), node.name, clone(node.arguments));
+        node.kind, clone(node.receiver), node.name, clone(node.arguments))
+      ..flags = node.flags;
   }
 
   @override
diff --git a/pkg/kernel/lib/src/equivalence.dart b/pkg/kernel/lib/src/equivalence.dart
index 47587659173..0aba1ac329a 100644
--- a/pkg/kernel/lib/src/equivalence.dart
+++ b/pkg/kernel/lib/src/equivalence.dart
@@ -2712,6 +2712,9 @@ class EquivalenceStrategy {
     if (!checkDynamicInvocation_arguments(visitor, node, other)) {
       result = visitor.resultOnInequivalence;
     }
+    if (!checkDynamicInvocation_flags(visitor, node, other)) {
+      result = visitor.resultOnInequivalence;
+    }
     if (!checkDynamicInvocation_fileOffset(visitor, node, other)) {
       result = visitor.resultOnInequivalence;
     }
@@ -7084,6 +7087,11 @@ class EquivalenceStrategy {
     return visitor.checkNodes(node.arguments, other.arguments, 'arguments');
   }
 
+  bool checkDynamicInvocation_flags(EquivalenceVisitor visitor,
+      DynamicInvocation node, DynamicInvocation other) {
+    return visitor.checkValues(node.flags, other.flags, 'flags');
+  }
+
   bool checkInvocationExpression_fileOffset(EquivalenceVisitor visitor,
       InvocationExpression node, InvocationExpression other) {
     return checkExpression_fileOffset(visitor, node, other);
diff --git a/pkg/kernel/lib/text/ast_to_text.dart b/pkg/kernel/lib/text/ast_to_text.dart
index 0b0ddb13394..c2570cce865 100644
--- a/pkg/kernel/lib/text/ast_to_text.dart
+++ b/pkg/kernel/lib/text/ast_to_text.dart
@@ -1529,16 +1529,16 @@ class Printer extends VisitorDefault<void> with VisitorVoidMixin {
   void _writeDynamicAccessKind(DynamicAccessKind kind) {
     switch (kind) {
       case DynamicAccessKind.Dynamic:
-        writeSymbol('{dynamic}.');
+        writeSymbol('{dynamic}');
         break;
       case DynamicAccessKind.Never:
-        writeSymbol('{Never}.');
+        writeSymbol('{Never}');
         break;
       case DynamicAccessKind.Invalid:
-        writeSymbol('{<invalid>}.');
+        writeSymbol('{<invalid>}');
         break;
       case DynamicAccessKind.Unresolved:
-        writeSymbol('{<unresolved>}.');
+        writeSymbol('{<unresolved>}');
         break;
     }
   }
@@ -1547,9 +1547,12 @@ class Printer extends VisitorDefault<void> with VisitorVoidMixin {
   void visitDynamicInvocation(DynamicInvocation node) {
     writeExpression(node.receiver, Precedence.PRIMARY);
     _writeDynamicAccessKind(node.kind);
-    writeName(
-      node.name,
-    );
+    if (!node.isImplicitCall) {
+      writeSymbol('.');
+      writeName(
+        node.name,
+      );
+    }
     writeNode(node.arguments);
   }
 
@@ -2122,6 +2125,7 @@ class Printer extends VisitorDefault<void> with VisitorVoidMixin {
   void visitDynamicGet(DynamicGet node) {
     writeExpression(node.receiver, Precedence.PRIMARY);
     _writeDynamicAccessKind(node.kind);
+    writeSymbol('.');
     writeName(node.name);
   }
 
@@ -2157,6 +2161,7 @@ class Printer extends VisitorDefault<void> with VisitorVoidMixin {
   @override
   void visitDynamicSet(DynamicSet node) {
     writeExpression(node.receiver, Precedence.PRIMARY);
+    writeSymbol('.');
     _writeDynamicAccessKind(node.kind);
     writeName(node.name);
     writeSpaced('=');
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/closures.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/closures.dart.expect
index c29fb805636..497d600ea16 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/closures.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/closures.dart.expect
@@ -89,19 +89,19 @@ static method useClosure15() → void {
   [@vm.inferred-type.metadata=!? (receiver not int)] #C2(42){(dynamic) → void};
 }
 static method useClosure21([@vm.inferred-arg-type.metadata=dart.core::_Closure (closure 1 in #lib::createClosure1)] dynamic func) → void {
-  [@vm.inferred-type.metadata=!? (receiver not int)] func{dynamic}.call(42);
+  [@vm.inferred-type.metadata=!? (receiver not int)] func{dynamic}(42);
 }
 static method useClosure22([@vm.inferred-arg-type.metadata=dart.core::_Closure (closure 1 in #lib::createClosure2)] dynamic func) → void {
-  [@vm.inferred-type.metadata=!? (receiver not int)] func{dynamic}.call(42);
+  [@vm.inferred-type.metadata=!? (receiver not int)] func{dynamic}(42);
 }
 static method useClosure23([@vm.inferred-arg-type.metadata=dart.core::_Closure (closure 0 in #lib::C.instanceMethod)] dynamic func) → void {
-  [@vm.inferred-type.metadata=!? (receiver not int)] func{dynamic}.call(42);
+  [@vm.inferred-type.metadata=!? (receiver not int)] func{dynamic}(42);
 }
 static method useClosure24() → void {
-  [@vm.inferred-type.metadata=!? (receiver not int)] #C1{dynamic}.call(42);
+  [@vm.inferred-type.metadata=!? (receiver not int)] #C1{dynamic}(42);
 }
 static method useClosure25() → void {
-  [@vm.inferred-type.metadata=!? (receiver not int)] #C2{dynamic}.call(42);
+  [@vm.inferred-type.metadata=!? (receiver not int)] #C2{dynamic}(42);
 }
 static method main() → void {
   self::useClosure11([@vm.inferred-type.metadata=dart.core::_Closure (closure 1 in #lib::createClosure1)] self::createClosure1() as{TypeError,ForDynamic} (dynamic) → void);
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect
index 9a4440cd9f5..b7870d7ee73 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect
@@ -59,7 +59,7 @@ class B2 extends self::B2Base {
     : super self::B2Base::•()
     ;
 [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:18,getterSelectorId:19]  method doSuperCall() → void {
-    [@vm.direct-call.metadata=#lib::A2.call] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.inferred-type.metadata=#lib::A2] super.{self::B2Base::aa2}{dynamic}.call(1, 2, 3, 4, 5, new self::T2::•());
+    [@vm.direct-call.metadata=#lib::A2.call] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.inferred-type.metadata=#lib::A2] super.{self::B2Base::aa2}{dynamic}(1, 2, 3, 4, 5, new self::T2::•());
   }
 }
 class T3 extends core::Object {
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_dynamic_method.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_dynamic_method.dart.expect
index 596de28c876..05fdb1a9ee8 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_dynamic_method.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_dynamic_method.dart.expect
@@ -19,7 +19,7 @@ class TearOffDynamicMethod extends core::Object {
 [@vm.inferred-type.metadata=dart.core::_Closure (closure 0 in #lib::B.foo)] [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4]  field dynamic bazz;
   constructor •([@vm.inferred-arg-type.metadata=#lib::B] dynamic arg) → self::TearOffDynamicMethod
     : self::TearOffDynamicMethod::bazz = [@vm.inferred-type.metadata=dart.core::_Closure (receiver not int) (closure 0 in #lib::B.foo)] arg{dynamic}.foo, super core::Object::•() {
-    [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.direct-call.metadata=#lib::TearOffDynamicMethod.bazz] [@vm.inferred-type.metadata=dart.core::_Closure (closure 0 in #lib::B.foo)] this.{self::TearOffDynamicMethod::bazz}{dynamic}{dynamic}.call();
+    [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.direct-call.metadata=#lib::TearOffDynamicMethod.bazz] [@vm.inferred-type.metadata=dart.core::_Closure (closure 0 in #lib::B.foo)] this.{self::TearOffDynamicMethod::bazz}{dynamic}{dynamic}();
   }
 }
 static method knownResult() → dynamic
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_interface_method.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_interface_method.dart.expect
index cd8b2e5a7fa..8e8a26f9609 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_interface_method.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_interface_method.dart.expect
@@ -27,5 +27,5 @@ class TearOffInterfaceMethod extends core::Object {
 static method knownResult() → dynamic
   return new self::B::•();
 static method main(core::List<core::String> args) → dynamic {
-  [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.direct-call.metadata=#lib::TearOffInterfaceMethod.bazz] [@vm.inferred-type.metadata=dart.core::_Closure (closure 0 in #lib::B.foo)] new self::TearOffInterfaceMethod::•(new self::B::•()).{self::TearOffInterfaceMethod::bazz}{dynamic}{dynamic}.call();
+  [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.direct-call.metadata=#lib::TearOffInterfaceMethod.bazz] [@vm.inferred-type.metadata=dart.core::_Closure (closure 0 in #lib::B.foo)] new self::TearOffInterfaceMethod::•(new self::B::•()).{self::TearOffInterfaceMethod::bazz}{dynamic}{dynamic}();
 }
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_super_method.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_super_method.dart.expect
index 70b3010d689..29db43ebbd3 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_super_method.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_super_method.dart.expect
@@ -25,7 +25,7 @@ abstract class Base extends core::Object {
 [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] [@vm.unboxing-info.metadata=()->i]  method foo() → core::int
     return _in::unsafeCast<core::int>([@vm.direct-call.metadata=dart.core::_IntegerImplementation.+] [@vm.inferred-type.metadata=int (skip check)] 3.{core::num::+}(_in::unsafeCast<core::num>([@vm.direct-call.metadata=#lib::B.foo] [@vm.inferred-type.metadata=int (receiver not int)] [@vm.inferred-type.metadata=#lib::B] self::knownResult(){dynamic}.foo())){(core::num) → core::num});
 [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6]  method doCall([@vm.inferred-arg-type.metadata=dart.core::_Closure (closure 0 in #lib::Base.foo)] dynamic x) → core::int?
-    return [@vm.inferred-type.metadata=!? (receiver not int)] x{dynamic}.call() as{TypeError,ForDynamic} core::int?;
+    return [@vm.inferred-type.metadata=!? (receiver not int)] x{dynamic}() as{TypeError,ForDynamic} core::int?;
 }
 class TearOffSuperMethod extends self::Base {
   synthetic constructor •() → self::TearOffSuperMethod
diff --git a/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc b/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc
index 70f780e7356..30a05c3f521 100644
--- a/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc
+++ b/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc
@@ -2802,7 +2802,7 @@ Fragment StreamingFlowGraphBuilder::BuildMethodInvocation(TokenPosition* p,
   ReadByte();                                  // read kind.
 
   // read flags.
-  const uint8_t flags = is_dynamic ? 0 : ReadFlags();
+  const uint8_t flags = ReadFlags();
   const bool is_invariant = (flags & kInstanceInvocationFlagInvariant) != 0;
 
   const TokenPosition position = ReadPosition();  // read position.
diff --git a/runtime/vm/compiler/frontend/kernel_fingerprints.cc b/runtime/vm/compiler/frontend/kernel_fingerprints.cc
index 889c1aaac4e..b026ca0d383 100644
--- a/runtime/vm/compiler/frontend/kernel_fingerprints.cc
+++ b/runtime/vm/compiler/frontend/kernel_fingerprints.cc
@@ -481,6 +481,7 @@ void KernelFingerprintHelper::CalculateExpressionFingerprint() {
       return;
     case kDynamicInvocation:
       ReadByte();                                // read kind.
+      ReadByte();                                // read flags.
       ReadPosition();                            // read position.
       CalculateExpressionFingerprint();          // read receiver.
       BuildHash(ReadNameAsMethodName().Hash());  // read name.
diff --git a/runtime/vm/compiler/frontend/kernel_translation_helper.cc b/runtime/vm/compiler/frontend/kernel_translation_helper.cc
index 0fc3570b546..177339655a2 100644
--- a/runtime/vm/compiler/frontend/kernel_translation_helper.cc
+++ b/runtime/vm/compiler/frontend/kernel_translation_helper.cc
@@ -2577,6 +2577,7 @@ void KernelReaderHelper::SkipExpression() {
       return;
     case kDynamicInvocation:
       ReadByte();        // read kind.
+      ReadByte();        // read flags.
       ReadPosition();    // read position.
       SkipExpression();  // read receiver.
       SkipName();        // read name.
diff --git a/runtime/vm/compiler/frontend/scope_builder.cc b/runtime/vm/compiler/frontend/scope_builder.cc
index 2a1b3a508e1..012a6865977 100644
--- a/runtime/vm/compiler/frontend/scope_builder.cc
+++ b/runtime/vm/compiler/frontend/scope_builder.cc
@@ -761,6 +761,7 @@ void ScopeBuilder::VisitExpression() {
       return;
     case kDynamicInvocation:
       helper_.ReadByte();      // read kind.
+      helper_.ReadByte();      // read flags.
       helper_.ReadPosition();  // read position.
       VisitExpression();       // read receiver.
       helper_.SkipName();      // read name.
diff --git a/runtime/vm/kernel_binary.h b/runtime/vm/kernel_binary.h
index 22bce54e4f6..32962c8289c 100644
--- a/runtime/vm/kernel_binary.h
+++ b/runtime/vm/kernel_binary.h
@@ -18,7 +18,7 @@ namespace kernel {
 // package:kernel/binary.md.
 
 static const uint32_t kMagicProgramFile = 0x90ABCDEFu;
-static const uint32_t kSupportedKernelFormatVersion = 114;
+static const uint32_t kSupportedKernelFormatVersion = 115;
 
 // Keep in sync with package:kernel/lib/binary/tag.dart
 #define KERNEL_TAG_LIST(V)                                                     \
@@ -248,6 +248,11 @@ enum InstanceInvocationFlags {
   kInstanceInvocationFlagBoundsSafe = 1 << 1,
 };
 
+// Keep in sync with package:kernel/lib/ast.dart
+enum DynamicInvocationFlags {
+  kDynamicInvocationFlagImplicitCall = 1 << 0,
+};
+
 // Keep in sync with package:kernel/lib/ast.dart
 enum YieldStatementFlags {
   kYieldStatementFlagYieldStar = 1 << 0,