diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t03.dart b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t03.dart
index a3b4446277..26f90c6dd2 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t03.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t03.dart
@@ -53,9 +53,9 @@ import "../../../../Utils/expect.dart";
 typedef A<X> = X Function(X);
 typedef G<X extends A<X>> = X Function();
 
-typedef B = dynamic Function(dynamic);
-typedef G_expected = B Function();
-
 main() {
-  Expect.equals(G_expected, G);
+  Expect.equals(
+      typeOf<G<A<dynamic>>>(),
+      typeOf<G>()
+  );
 }
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t07.dart b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t07.dart
index a86848c475..d5a3d0d77a 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t07.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t07.dart
@@ -53,9 +53,9 @@ import "../../../../Utils/expect.dart";
 typedef A<X> = X Function(X);
 typedef G<X extends A<X>> = void Function(X);
 
-typedef B = dynamic Function(dynamic);
-typedef G_expected = void Function(B);
-
 main() {
-  Expect.equals(G_expected, G);
+  Expect.equals(
+      typeOf<G<A<dynamic>>>(),
+      typeOf<G>()
+  );
 }
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t11.dart b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t11.dart
index 173206c82e..a57fb84dc4 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t11.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t11.dart
@@ -53,9 +53,9 @@ import "../../../../Utils/expect.dart";
 typedef A<X> = X Function(X);
 typedef G<X extends A<X>> = X Function(X);
 
-typedef B = dynamic Function(dynamic);
-typedef G_expected = B Function(B);
-
 main() {
-  Expect.equals(G_expected, G);
+  Expect.equals(
+      typeOf<G<A<dynamic>>>(),
+      typeOf<G>()
+  );
 }
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t14.dart b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t14.dart
index aa85f168c0..6f0a718fae 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t14.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t14.dart
@@ -43,8 +43,7 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef A<X> = void Function(X);
- * typedef G<X extends A<X>> = void Function()]
+ * typedef A<X> = void Function(X); typedef G<X extends A<X>> = void Function()
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
@@ -56,7 +55,7 @@ typedef G<X extends A<X>> = void Function();
 
 main() {
   Expect.equals(
-    typeOf<G<A<Never>>>(),
+    typeOf<G<A<dynamic>>>(),
     typeOf<G>()
   );
 }
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t15.dart b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t15.dart
index 6d5ec1b580..af9291f347 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t15.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t15.dart
@@ -43,7 +43,7 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef A<X> = X Function(X); typedef G<X extends A<X>> = void Function()]
+ * typedef A<X> = X Function(X); typedef G<X extends A<X>> = void Function()
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t16.dart b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t16.dart
index 0df5ffb218..091fb103a1 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t16.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/dynamic/typedef_typedef_l1_t16.dart
@@ -43,7 +43,7 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef A<X> = void Function(); typedef G<X extends A<X>> = void Function()]
+ * typedef A<X> = void Function(); typedef G<X extends A<X>> = void Function()
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t02.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t02.dart
index 25fd2e074f..ab255437cf 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t02.dart
@@ -43,9 +43,9 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef A<X> = void Function(X);
+ * typedef A<X> = void Function(X);
+ * typedef G<X extends A<X>> = X Function()
  * @Issue 34689
- * typedef G<X extends A<X>> = void Function(X)]
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
@@ -53,67 +53,68 @@
 import "../../../../Utils/expect.dart";
 
 typedef A<X> = void Function(X);
-typedef G<X extends A<X>> = Function(X);
+typedef G<X extends A<X>> = X Function();
 
-main() {
-  G? source;
+void test(G source) {
   var fsource = toF(source);
 
-  F<G<A<Never>>?>? target = fsource;
-/*
-  F<G<A<Null>>?>? target1 = fsource;
-//                          ^^^^^^^
+  F<G<A<Never>>> target = fsource;
+
+  F<G<A<Null>>> target1 = fsource;
+//                        ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-  F<G<A<dynamic>>?>? target2 = fsource;
-//                             ^^^^^^^
+  F<G<A<dynamic>>> target2 = fsource;
+//                           ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-  F<G<A<A<dynamic>>>?>? target3 = fsource;
-//                                ^^^^^^^
+  F<G<A<A<dynamic>>>> target3 = fsource;
+//                              ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-  F<G<A<A<A<dynamic>>>>?>? target4 = fsource;
-//                                   ^^^^^^^
+  F<G<A<A<A<dynamic>>>>> target4 = fsource;
+//                                 ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-  F<G<A<A<A<A<dynamic>>>>>?>? target5 = fsource;
-//                                      ^^^^^^^
+  F<G<A<A<A<A<dynamic>>>>>> target5 = fsource;
+//                                    ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-  F<G<A<A<Never>>>?>? target6 = fsource;
-//                              ^^^^^^^
+  F<G<A<A<Never>>>> target6 = fsource;
+//                            ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-  F<G<A<A<A<Never>>>>?>? target7 = fsource;
-//                                 ^^^^^^^
+  F<G<A<A<A<Never>>>>> target7 = fsource;
+//                               ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-  F<G<A<A<A<A<Never>>>>>?>? target8 = fsource;
-//                                    ^^^^^^^
+  F<G<A<A<A<A<Never>>>>>> target8 = fsource;
+//                                  ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-  F<G<A<A<Null>>>?>? target9 = fsource;
-//                             ^^^^^^^
+  F<G<A<A<Null>>>> target9 = fsource;
+//                           ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-  F<G<A<A<A<Null>>>>?>? target10 = fsource;
-//                                 ^^^^^^^
+  F<G<A<A<A<Null>>>>> target10 = fsource;
+//                               ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-  F<G<A<A<A<A<Null>>>>>?>? target11 = fsource;
-//                                    ^^^^^^^
+  F<G<A<A<A<A<Null>>>>>> target11 = fsource;
+//                                  ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-*/
 }
+
+main() {}
+
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t03.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t03.dart
index 123294cf7b..438fe71752 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t03.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t03.dart
@@ -43,7 +43,7 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef A<X> = X Function(X); typedef G<X extends A<X>> = X Function(X)]
+ * [typedef A<X> = X Function(X); typedef G<X extends A<X>> = X Function()]
  *
  * @Issue 41963, 41964
  *
@@ -51,12 +51,71 @@
  */
 // SharedOptions=--enable-experiment=non-nullable
 
+import "../../../../Utils/expect.dart";
+
 typedef A<X> = X Function(X);
 typedef G<X extends A<X>> = X Function();
 
-main() {
-  G? source;
-//   ^^^^^^
+void test(G source) {
+  var fsource = toF(source);
+
+  F<G<A<dynamic>>> target = fsource;
+
+  F<G<A<Never>>> target1 = fsource;
+//                         ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<Null>>> target2 = fsource;
+//                        ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<dynamic>>>> target3 = fsource;
+//                              ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<dynamic>>>>> target4 = fsource;
+//                                 ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<dynamic>>>>>> target5 = fsource;
+//                                    ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<Never>>>> target6 = fsource;
+//                            ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<Never>>>>> target7 = fsource;
+//                               ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Never>>>>>> target8 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<Null>>>> target9 = fsource;
+//                           ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<Null>>>>> target10 = fsource;
+//                               ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Null>>>>>> target11 = fsource;
+//                                  ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 }
+
+main() {}
+
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t04.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t04.dart
index 0362816c86..599df4381b 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t04.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t04.dart
@@ -53,44 +53,17 @@ import "../../../../Utils/expect.dart";
 typedef A<X> = void Function();
 typedef G<X extends A<X>> = X Function();
 
-main() {
-  G? source;
+void test(G source) {
   var fsource = toF(source);
 
-  F<G<A<dynamic>>?>? target = fsource;
-
-  F<G<A<Never>>?>? target1 = fsource;
-//                           ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<Null>>?>? target2 = fsource;
-//                          ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<dynamic>>>?>? target3 = fsource;
-//                                ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<A<dynamic>>>>?>? target4 = fsource;
-//                                   ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<Never>>>?>? target6 = fsource;
-//                              ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<A<Never>>>>?>? target7 = fsource;
-//                                 ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  F<G<A<A<A<A<Never>>>>>?>? target8 = fsource;
-//                                    ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
+  F<G<A<dynamic>>> target = fsource;
+  F<G<A<Never>>> target1 = fsource;
+  F<G<A<Null>>> target2 = fsource;
+  F<G<A<A<dynamic>>>> target3 = fsource;
+  F<G<A<A<A<dynamic>>>>> target4 = fsource;
+  F<G<A<A<Never>>>> target6 = fsource;
+  F<G<A<A<A<Never>>>>> target7 = fsource;
+  F<G<A<A<A<A<Never>>>>>> target8 = fsource;
 }
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t07.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t07.dart
index dc97a1b2ea..8759c56f5d 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t07.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t07.dart
@@ -49,13 +49,69 @@
  */
  // SharedOptions=--enable-experiment=non-nullable
 
+import "../../../../Utils/expect.dart";
+
 typedef A<X> = X Function(X);
 typedef G<X extends A<X>> = void Function(X);
 
-main() {
-  G? source;
-//   ^^^^^^^
+void test(G source) {
+  var fsource = toF(source);
+
+  F<G<A<dynamic>>> target = fsource;
+
+  F<G<A<Never>>> target1 = fsource;
+//                         ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<Null>>> target2 = fsource;
+//                        ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<dynamic>>>> target3 = fsource;
+//                              ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<dynamic>>>>> target4 = fsource;
+//                                 ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<dynamic>>>>>> target5 = fsource;
+//                                    ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<Never>>>> target6 = fsource;
+//                            ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<Never>>>>> target7 = fsource;
+//                               ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Never>>>>>> target8 = fsource;
+//                                  ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
 
-}
\ No newline at end of file
+  F<G<A<A<Null>>>> target9 = fsource;
+//                           ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<Null>>>>> target10 = fsource;
+//                               ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Null>>>>>> target11 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+}
+  main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t08.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t08.dart
index 1fa4fa324c..615d15fd09 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t08.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t08.dart
@@ -42,74 +42,31 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef A<X> = void Function();
-    typedef G<X extends A<X>> = void Function(X)]
+ * typedef A<X> = void Function(); typedef G<X extends A<X>> = void Function(X)
  * @author iarkh@unipro.ru
  */
  // SharedOptions=--enable-experiment=non-nullable
 
- import "../../../../Utils/expect.dart";
+import "../../../../Utils/expect.dart";
 
 typedef A<X> = void Function();
 typedef G<X extends A<X>> = void Function(X);
 
-main() {
-  G? source;
+void testme(G source) {
   var fsource = toF(source);
-  F<G<A<Never>>?>? target = fsource;
 
-  F<G<A<Null>>?>? target0 = fsource;
-//                          ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
+  F<G<A<Never>>> target = fsource;
+  F<G<A<Null>>> target0 = fsource;
+  F<G<A<dynamic>>> target1 = fsource;
+  F<G<A<A<dynamic>>>> target2 = fsource;
+  F<G<A<A<A<dynamic>>>>> target3 = fsource;
+  F<G<A<A<A<A<dynamic>>>>>> target4 = fsource;
+  F<G<A<A<Never>>>> target5 = fsource;
+  F<G<A<A<A<Never>>>>> target6 = fsource;
+  F<G<A<A<A<A<Never>>>>>> target7 = fsource;
+  F<G<A<A<Null>>>> target8 = fsource;
+  F<G<A<A<A<Null>>>>> target9 = fsource;
+  F<G<A<A<A<A<Null>>>>>> target10 = fsource;
+}
 
-  F<G<A<dynamic>>?>? target1 = fsource;
-//                             ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<dynamic>>>?>? target2 = fsource;
-//                                ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<A<dynamic>>>>?>? target3 = fsource;
-//                                   ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<A<A<dynamic>>>>>?>? target4 = fsource;
-//                                      ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<Never>>>?>? target5 = fsource;
-//                              ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<A<Never>>>>?>? target6 = fsource;
-//                                 ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<A<A<Never>>>>>?>? target7 = fsource;
-//                                    ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<Null>>>?>? target8 = fsource;
-//                             ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<A<Null>>>>?>? target9 = fsource;
-//                                ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  F<G<A<A<A<A<Null>>>>>?>? target10 = fsource;
-//                                    ^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-}
\ No newline at end of file
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t09.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t09.dart
index 2c8628ba43..fc82660604 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t09.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t09.dart
@@ -43,18 +43,76 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef A<X> = X Function(); typedef G<X extends A<X>> = X Function(X)]
+ * typedef A<X> = X Function(); typedef G<X extends A<X>> = X Function(X)
  * @Issue 41963, 41964
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
 
+import "../../../../Utils/expect.dart";
+
 typedef A<X> = X Function();
 typedef G<X extends A<X>> = X Function(X);
 
-main() {
-  G? source;
-//   ^^^^^^
+void test(G source) {
+  var fsource = toF(source);
+
+  F<G<A<dynamic>>> target = fsource;
+
+  F<G<A<Null>>> target1 = fsource;
+//                        ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<Never>>> target2 = fsource;
+//                         ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<dynamic>>>> target3 = fsource;
+//                              ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<dynamic>>>>> target4 = fsource;
+//                                 ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<dynamic>>>>>> target5 = fsource;
+//                                    ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<Never>>>> target6 = fsource;
+//                            ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-}
\ No newline at end of file
+
+  F<G<A<A<A<Never>>>>> target7 = fsource;
+//                               ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Never>>>>>> target8 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<Null>>>> target9 = fsource;
+//                           ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<Null>>>>> target10 = fsource;
+//                               ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Null>>>>>> target11 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t10.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t10.dart
index 088e3a2166..905ed2d00b 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t10.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t10.dart
@@ -49,12 +49,70 @@
  */
 // SharedOptions=--enable-experiment=non-nullable
 
+import "../../../../Utils/expect.dart";
+
 typedef A<X> = void Function(X);
 typedef G<X extends A<X>> = X Function(X);
 
-main() {
-  G? source;
-//   ^^^^^^
+void test(G source) {
+  var fsource = toF(source);
+
+  F<G<A<dynamic>>> target = fsource;
+
+  F<G<A<Null>>> target1 = fsource;
+//                        ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<Never>>> target2 = fsource;
+//                         ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<dynamic>>>> target3 = fsource;
+//                              ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<dynamic>>>>> target4 = fsource;
+//                                 ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<dynamic>>>>>> target5 = fsource;
+//                                    ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<Never>>>> target6 = fsource;
+//                            ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-}
\ No newline at end of file
+
+  F<G<A<A<A<Never>>>>> target7 = fsource;
+//                               ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Never>>>>>> target8 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<Null>>>> target9 = fsource;
+//                           ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<Null>>>>> target10 = fsource;
+//                               ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Null>>>>>> target11 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t11.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t11.dart
index 5102106c50..13ad26ca83 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t11.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t11.dart
@@ -49,12 +49,70 @@
  */
 // SharedOptions=--enable-experiment=non-nullable
 
+import "../../../../Utils/expect.dart";
+
 typedef A<X> = X Function(X);
 typedef G<X extends A<X>> = X Function(X);
 
-main() {
-  G? source;
-//   ^^^^^^
+void test(G source) {
+  var fsource = toF(source);
+
+  F<G<A<dynamic>>> target = fsource;
+
+  F<G<A<Null>>> target1 = fsource;
+//                        ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<Never>>> target2 = fsource;
+//                         ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<dynamic>>>> target3 = fsource;
+//                              ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<dynamic>>>>> target4 = fsource;
+//                                 ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<dynamic>>>>>> target5 = fsource;
+//                                    ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<Never>>>> target6 = fsource;
+//                            ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-}
\ No newline at end of file
+
+  F<G<A<A<A<Never>>>>> target7 = fsource;
+//                               ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Never>>>>>> target8 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<Null>>>> target9 = fsource;
+//                           ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<Null>>>>> target10 = fsource;
+//                               ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Null>>>>>> target11 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t12.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t12.dart
index adf6e5e2d5..5481555c28 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t12.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t12.dart
@@ -53,8 +53,21 @@ import "../../../../Utils/expect.dart";
 typedef A<X> = void Function();
 typedef G<X extends A<X>> = X Function(X);
 
-main() {
-  G? source;
+void testme(G source) {
   var fsource = toF(source);
-  F<G<A<dynamic>>?>? target = fsource;
-}
\ No newline at end of file
+
+  F<G<A<Never>>> target = fsource;
+  F<G<A<Null>>> target0 = fsource;
+  F<G<A<dynamic>>> target1 = fsource;
+  F<G<A<A<dynamic>>>> target2 = fsource;
+  F<G<A<A<A<dynamic>>>>> target3 = fsource;
+  F<G<A<A<A<A<dynamic>>>>>> target4 = fsource;
+  F<G<A<A<Never>>>> target5 = fsource;
+  F<G<A<A<A<Never>>>>> target6 = fsource;
+  F<G<A<A<A<A<Never>>>>>> target7 = fsource;
+  F<G<A<A<Null>>>> target8 = fsource;
+  F<G<A<A<A<Null>>>>> target9 = fsource;
+  F<G<A<A<A<A<Null>>>>>> target10 = fsource;
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t13.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t13.dart
index 9bc74cbcc8..aac16f4c82 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t13.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t13.dart
@@ -43,18 +43,49 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef A<X> = X Function(); typedef G<X extends A<X>> = void Function()]
+ * typedef A<X> = X Function(); typedef G<X extends A<X>> = void Function()
  * @Issue 41963, 41964
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
 
+import "../../../../Utils/expect.dart";
+
 typedef A<X> = X Function();
 typedef G<X extends A<X>> = void Function();
 
-main() {
-  G? source;
-//   ^^^^^^
+void testme(G source) {
+  var fsource = toF(source);
+
+  F<G<A<Never>>> target = fsource;
+
+  F<G<A<Null>>> target0 = fsource;
+//                        ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<dynamic>>> target1 = fsource;
+  F<G<A<A<dynamic>>>> target2 = fsource;
+  F<G<A<A<A<dynamic>>>>> target3 = fsource;
+  F<G<A<A<A<A<dynamic>>>>>> target4 = fsource;
+  F<G<A<A<Never>>>> target5 = fsource;
+  F<G<A<A<A<Never>>>>> target6 = fsource;
+  F<G<A<A<A<A<Never>>>>>> target7 = fsource;
+
+  F<G<A<A<Null>>>> target8 = fsource;
+//                           ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-}
\ No newline at end of file
+
+  F<G<A<A<A<Null>>>>> target9 = fsource;
+//                              ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Null>>>>>> target10 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t14.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t14.dart
index ff170210d3..77529370c9 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t14.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t14.dart
@@ -43,18 +43,49 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef A<X> = void Function(X); typedef G<X extends A<X>> = void Function()]
+ * typedef A<X> = void Function(X); typedef G<X extends A<X>> = void Function()
  * @Issue 41963, 41964
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
 
+import "../../../../Utils/expect.dart";
+
 typedef A<X> = void Function(X);
 typedef G<X extends A<X>> = void Function();
 
-main() {
-  G? source;
-//   ^^^^^^
+void testme(G source) {
+  var fsource = toF(source);
+
+  F<G<A<Never>>> target = fsource;
+
+  F<G<A<Null>>> target0 = fsource;
+//                        ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<dynamic>>> target1 = fsource;
+  F<G<A<A<dynamic>>>> target2 = fsource;
+  F<G<A<A<A<dynamic>>>>> target3 = fsource;
+  F<G<A<A<A<A<dynamic>>>>>> target4 = fsource;
+  F<G<A<A<Never>>>> target5 = fsource;
+  F<G<A<A<A<Never>>>>> target6 = fsource;
+  F<G<A<A<A<A<Never>>>>>> target7 = fsource;
+
+  F<G<A<A<Null>>>> target8 = fsource;
+//                           ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-}
\ No newline at end of file
+
+  F<G<A<A<A<Null>>>>> target9 = fsource;
+//                              ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Null>>>>>> target10 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t15.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t15.dart
index 7253dd792d..2fdcbb5173 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t15.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t15.dart
@@ -43,18 +43,49 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef A<X> = X Function(X); typedef G<X extends A<X>> = void Function()]
+ * typedef A<X> = X Function(X); typedef G<X extends A<X>> = void Function()
  * @Issue 41963, 41964
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
 
+import "../../../../Utils/expect.dart";
+
 typedef A<X> = X Function(X);
 typedef G<X extends A<X>> = void Function();
 
-main() {
-  G? source;
-//   ^^^^^^
+void testme(G source) {
+  var fsource = toF(source);
+
+  F<G<A<Never>>> target = fsource;
+
+  F<G<A<Null>>> target0 = fsource;
+//                        ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<dynamic>>> target1 = fsource;
+  F<G<A<A<dynamic>>>> target2 = fsource;
+  F<G<A<A<A<dynamic>>>>> target3 = fsource;
+  F<G<A<A<A<A<dynamic>>>>>> target4 = fsource;
+  F<G<A<A<Never>>>> target5 = fsource;
+  F<G<A<A<A<Never>>>>> target6 = fsource;
+  F<G<A<A<A<A<Never>>>>>> target7 = fsource;
+
+  F<G<A<A<Null>>>> target8 = fsource;
+//                           ^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-}
\ No newline at end of file
+
+  F<G<A<A<A<Null>>>>> target9 = fsource;
+//                              ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  F<G<A<A<A<A<Null>>>>>> target10 = fsource;
+//                                  ^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t16.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t16.dart
index 81965bb5d5..162bbae9bc 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t16.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t16.dart
@@ -53,8 +53,21 @@ import "../../../../Utils/expect.dart";
 typedef A<X> = void Function();
 typedef G<X extends A<X>> = void Function();
 
-main() {
-  G? source;
+void testme(G source) {
   var fsource = toF(source);
-  F<G<A<dynamic>>?>? target = fsource;
-}
\ No newline at end of file
+
+  F<G<A<Never>>> target = fsource;
+  F<G<A<Null>>> target0 = fsource;
+  F<G<A<dynamic>>> target1 = fsource;
+  F<G<A<A<dynamic>>>> target2 = fsource;
+  F<G<A<A<A<dynamic>>>>> target3 = fsource;
+  F<G<A<A<A<A<dynamic>>>>>> target4 = fsource;
+  F<G<A<A<Never>>>> target5 = fsource;
+  F<G<A<A<A<Never>>>>> target6 = fsource;
+  F<G<A<A<A<A<Never>>>>>> target7 = fsource;
+  F<G<A<A<Null>>>> target8 = fsource;
+  F<G<A<A<A<Null>>>>> target9 = fsource;
+  F<G<A<A<A<A<Null>>>>>> target10 = fsource;
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t17.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t17.dart
index b679925bce..528e117d27 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t17.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t17.dart
@@ -43,8 +43,8 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef typedef A<X> = X Function();
- * typedef G<X extends A<X>> = void Function<Y extends X>()]
+ * typedef typedef A<X> = X Function();
+ * typedef G<X extends A<X>> = void Function<Y extends X>()
  * @Issue 41963, 41964
  * @author iarkh@unipro.ru
  */
@@ -53,9 +53,18 @@
 typedef A<X> = X Function();
 typedef G<X extends A<X>> = void Function<Y extends X>();
 
-main() {
-  G? source;
-//   ^^^^^^
+void test(G source) {
+  void Function<X extends dynamic Function()>() target1 = source;
+
+  void Function<X extends Never Function()>() target2 = source;
+//                                                      ^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-}
\ No newline at end of file
+
+  void Function<X extends Null Function()>() target3 = source;
+//                                                     ^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t18.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t18.dart
index e16161e0be..972925e5f7 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t18.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t18.dart
@@ -43,8 +43,8 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef typedef A<X> = void Function(X);
- * typedef G<X extends A<X>> = void Function<Y extends X>()]
+ * typedef typedef A<X> = void Function(X);
+ * typedef G<X extends A<X>> = void Function<Y extends X>()
  * @Issue 41963, 41964
  * @author iarkh@unipro.ru
  */
@@ -53,9 +53,18 @@
 typedef A<X> = void Function(X);
 typedef G<X extends A<X>> = void Function<Y extends X>();
 
-main() {
-  G? source;
-//   ^^^^^^
+void test(G source) {
+  void Function<X extends void Function(dynamic)>() target1 = source;
+
+  void Function<X extends void Function(Never)>() target2 = source;
+//                                                          ^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-}
\ No newline at end of file
+
+  void Function<X extends void Function(Null)>() target3 = source;
+//                                                         ^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t19.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t19.dart
index 3df18c77d4..e73b1ca798 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t19.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t19.dart
@@ -43,8 +43,8 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef typedef A<X> = X Function(X);
- * typedef G<X extends A<X>> = void Function<Y extends X>()]
+ * typedef typedef A<X> = X Function(X);
+ * typedef G<X extends A<X>> = void Function<Y extends X>()
  * @Issue 41963, 41964
  * @author iarkh@unipro.ru
  */
@@ -53,9 +53,18 @@
 typedef A<X> = X Function(X);
 typedef G<X extends A<X>> = void Function<Y extends X>();
 
-main() {
-  G? source;
-//   ^^^^^^
+void test(G source) {
+  void Function<X extends dynamic Function(dynamic)>() target1 = source;
+
+  void Function<X extends Never Function()>(Never) target2 = source;
+//                                                           ^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-}
\ No newline at end of file
+
+  void Function<X extends Null Function(Null)>() target3 = source;
+//                                                         ^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+}
+
+main() {}
diff --git a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t20.dart b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t20.dart
index 5d462ee5d8..de223ac364 100644
--- a/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t20.dart
+++ b/LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_typedef_l1_t20.dart
@@ -43,8 +43,8 @@
  *   3. Otherwise, (when no dependencies exist) terminate with the result
  *   [<U1,m ..., Uk,m>].
  * @description Checks that instantiate-to-bounds works correctly for
- * [typedef typedef A<X> = void Function();
- * typedef G<X extends A<X>> = void Function<Y extends X>()]
+ * typedef typedef A<X> = void Function();
+ * typedef G<X extends A<X>> = void Function<Y extends X>()
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
@@ -52,9 +52,8 @@
 typedef A<X> = void Function();
 typedef G<X extends A<X>> = void Function<Y extends X>();
 
-typedef B = void Function();
+void test(G source) {
+  void Function<X extends void Function()>() target = source;
+}
 
-main() {
-  G? source;
-  void Function<X extends B>()? target = source;
-}
\ No newline at end of file
+main() {}