diff --git a/LanguageFeatures/Enhanced-Enum/semantics_A09_t01.dart b/LanguageFeatures/Enhanced-Enum/semantics_A09_t01.dart
index 548f7ef..d198a7f 100644
--- a/LanguageFeatures/Enhanced-Enum/semantics_A09_t01.dart
+++ b/LanguageFeatures/Enhanced-Enum/semantics_A09_t01.dart
@@ -14,20 +14,17 @@
 // SharedOptions=--enable-experiment=enhanced-enums
 
 enum E1 {
-//   ^^
-// [analyzer] unspecified
   e1,
   e2,
   e3;
 
   final int values = 42;
 //          ^^^^^^
+// [analyzer] unspecified
 // [cfe] unspecified
 }
 
 enum E2<T> {
-//   ^^^^^
-// [analyzer] unspecified
   e1<int>(42),
   e2<String>("42"),
   e3<bool>(false);
@@ -36,6 +33,7 @@
 
   final List<E2> values = const [];
 //               ^^^^^^
+// [analyzer] unspecified
 // [cfe] unspecified
 }
 
diff --git a/LanguageFeatures/Enhanced-Enum/semantics_A09_t02.dart b/LanguageFeatures/Enhanced-Enum/semantics_A09_t02.dart
index a566190..f08afae 100644
--- a/LanguageFeatures/Enhanced-Enum/semantics_A09_t02.dart
+++ b/LanguageFeatures/Enhanced-Enum/semantics_A09_t02.dart
@@ -49,7 +49,7 @@
 
 enum E3 {
 //   ^^
-// [analyzer] unspecified
+// [cfe] unspecified
   e1,
   e2,
   e3;
@@ -57,7 +57,6 @@
   static final int e1 = 42;
 //                 ^^
 // [analyzer] unspecified
-// [cfe] unspecified
 }
 
 main() {
diff --git a/LanguageFeatures/Enhanced-Enum/semantics_A09_t04.dart b/LanguageFeatures/Enhanced-Enum/semantics_A09_t04.dart
index 0e36404..574d981 100644
--- a/LanguageFeatures/Enhanced-Enum/semantics_A09_t04.dart
+++ b/LanguageFeatures/Enhanced-Enum/semantics_A09_t04.dart
@@ -22,12 +22,11 @@
   e1,
 //^^
 // [analyzer] unspecified
+// [cfe] unspecified
   e2,
   e3;
 
   int get e1 => 42;
-//        ^^
-// [cfe] unspecified
 }
 
 enum E2<T> {
@@ -35,12 +34,11 @@
   e2<String>("42"),
 //^^
 // [analyzer] unspecified
+// [cfe] unspecified
   e3<bool>(false);
 
   const E2(T t);
   int get e2 => 42;
-//        ^^
-// [cfe] unspecified
 }
 
 enum E3 {
diff --git a/LanguageFeatures/Enhanced-Enum/semantics_A09_t05.dart b/LanguageFeatures/Enhanced-Enum/semantics_A09_t05.dart
index c207680..f28c659 100644
--- a/LanguageFeatures/Enhanced-Enum/semantics_A09_t05.dart
+++ b/LanguageFeatures/Enhanced-Enum/semantics_A09_t05.dart
@@ -44,13 +44,14 @@
 
 enum E3 {
   e1,
+//^^
+// [cfe] unspecified
   e2,
   e3;
 
-  static void set e1(E3 v) {}
+  static void set e1(int v) {}
 //                ^^
 // [analyzer] unspecified
-// [cfe] unspecified
 }
 
 main() {