Update element writer to not print enclosing element/fragment

As noted in a TODO, I'd like to do the same for the previous/next
fragment chain. Let me know if you think we shouldn't.

Change-Id: I523765b4088e853b745fa5826b431aa4ff56625c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/384300
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/test/src/summary/element_text.dart b/pkg/analyzer/test/src/summary/element_text.dart
index e028660..794cbc5 100644
--- a/pkg/analyzer/test/src/summary/element_text.dart
+++ b/pkg/analyzer/test/src/summary/element_text.dart
@@ -121,22 +121,6 @@
     }
   }
 
-  void _writeElements<T extends Object>(
-    String name,
-    List<T> elements,
-    void Function(T) write,
-  ) {
-    var filtered = elements.where(configuration.filter).toList();
-    if (filtered.isNotEmpty) {
-      _sink.writelnWithIndent(name);
-      _sink.withIndent(() {
-        for (var element in filtered) {
-          write(element);
-        }
-      });
-    }
-  }
-
   void _writeExportedReferences(LibraryElementImpl e) {
     var exportedReferences = e.exportedReferences.toList();
     exportedReferences.sortBy((e) => e.reference.toString());
@@ -223,7 +207,7 @@
       _writeMetadata(e.metadata);
       _writeSinceSdkVersion(e.sinceSdkVersion);
 
-      // _writeElements(
+      // _writeList(
       //   'libraryExports',
       //   e.libraryExports,
       //   _writeLibraryExportElement,
@@ -239,18 +223,19 @@
         expect(fragment.element, same(e));
       }
 
-      _writeElements('fragments', fragments, _writeLibraryFragment);
+      _writeFragmentList('fragments', null, fragments, _writeLibraryFragment);
 
-      _writeElements('classes', e.classes, _writeInstanceElement);
-      _writeElements('enums', e.enums, _writeInstanceElement);
-      _writeElements('extensions', e.extensions, _writeInstanceElement);
-      _writeElements('extensionTypes', e.extensionTypes, _writeInstanceElement);
-      _writeElements('mixins', e.mixins, _writeInstanceElement);
+      _writeElementList('classes', e, e.classes, _writeInstanceElement);
+      _writeElementList('enums', e, e.enums, _writeInstanceElement);
+      _writeElementList('extensions', e, e.extensions, _writeInstanceElement);
+      _writeElementList(
+          'extensionTypes', e, e.extensionTypes, _writeInstanceElement);
+      _writeElementList('mixins', e, e.mixins, _writeInstanceElement);
 
-      _writeElements('topLevelVariables', e.topLevelVariables,
+      _writeElementList('topLevelVariables', e, e.topLevelVariables,
           _writeTopLevelVariableElement);
-      _writeElements('getters', e.getters, _writeGetterElement);
-      _writeElements('setters', e.setters, _writeSetterElement);
+      _writeElementList('getters', e, e.getters, _writeGetterElement);
+      _writeElementList('setters', e, e.setters, _writeSetterElement);
 
       if (configuration.withExportScope) {
         _sink.writelnWithIndent('exportedReferences');
@@ -330,15 +315,15 @@
 
     _sink.withIndent(() {
       _writeElementReference('reference', e);
-      // _writeEnclosingElement(e);
       _writeDocumentation(e.documentationComment);
       _writeMetadata(e.metadata);
       _writeSinceSdkVersion(e.sinceSdkVersion);
       // _writeDisplayName(e);
 
-      _writeElements('parameters', e.parameters2, _writeFormalParameterElement);
+      _writeElementList(
+          'parameters', e, e.parameters2, _writeFormalParameterElement);
 
-      // _writeElements(
+      // _writeList(
       //   'constantInitializers',
       //   e.constantInitializers,
       //   _writeNode,
@@ -390,7 +375,6 @@
 
     _sink.withIndent(() {
       _writeFragmentReference('reference', f);
-      _writeFragmentReference('enclosingFragment', f.enclosingFragment);
       _writeDocumentation(f.documentationComment);
       _writeMetadata(f.metadata);
       _writeSinceSdkVersion(f.sinceSdkVersion);
@@ -406,7 +390,7 @@
 
       // _writeParameterElements(f.parameters);
 
-      _writeElements(
+      _writeList(
         'constantInitializers',
         f.constantInitializers,
         _writeNode,
@@ -458,6 +442,33 @@
     }
   }
 
+  void _writeElementList<E extends Element2>(
+    String name,
+    Element2 expectedEnclosingElement,
+    List<E> elements,
+    void Function(E) write,
+  ) {
+    var filtered = elements.where(configuration.filter).toList();
+    if (filtered.isNotEmpty) {
+      _sink.writelnWithIndent(name);
+      _sink.withIndent(() {
+        for (var element in filtered) {
+          if (element is LibraryImport || element is LibraryExport) {
+            // These are only accidentally subtypes of `Element2` and don't have
+            // an enclosing element.
+          } else if (element is PrefixElement2) {
+            // Asking a `PrefixElement2` for it's enclosing element currently
+            // throws an exception (because it doesn't have an enclosing
+            // element, only an enclosing fragment).
+          } else {
+            expect(element.enclosingElement2, expectedEnclosingElement);
+          }
+          write(element);
+        }
+      });
+    }
+  }
+
   void _writeElementName(Element2 e) {
     _sink.write(_elementName(e));
   }
@@ -493,13 +504,6 @@
     }
   }
 
-  void _writeEnclosingElement(Element2 e) {
-    _elementPrinter.writeNamedElement(
-      'enclosingElement2',
-      e.enclosingElement2 as Element?,
-    );
-  }
-
   void _writeExportNamespace(LibraryElement2 e) {
     var map = e.exportNamespace.definedNames;
     var sortedEntries = map.entries.sortedBy((entry) => entry.key);
@@ -558,7 +562,6 @@
 
     _sink.withIndent(() {
       _writeElementReference('reference', e);
-      _writeElementReference('enclosingElement', e.enclosingElement2!);
       // _writeDocumentation(e.documentationComment);
       // _writeMetadata(e.metadata);
       // _writeSinceSdkVersion(e.sinceSdkVersion);
@@ -628,7 +631,6 @@
 
     _sink.withIndent(() {
       _writeFragmentReference('reference', f);
-      _writeFragmentReference('enclosingFragment', f.enclosingFragment);
       // _writeDocumentation(f.documentationComment);
       // _writeMetadata(f.metadata);
       // _writeSinceSdkVersion(f.sinceSdkVersion);
@@ -690,7 +692,8 @@
       _writeSinceSdkVersion(e.sinceSdkVersion);
       // _writeCodeRange(e);
       // _writeTypeParameterElements(e.typeParameters2);
-      _writeElements('parameters', e.parameters2, _writeFormalParameterElement);
+      _writeElementList(
+          'parameters', e, e.parameters2, _writeFormalParameterElement);
       // _writeConstantInitializer(e);
       // _writeNonSyntheticElement(e);
       // _writeFieldFormalParameterField(e);
@@ -741,7 +744,7 @@
       _writeSinceSdkVersion(f.sinceSdkVersion);
       // _writeCodeRange(f);
       // _writeTypeParameterElements(e.typeParameters);
-      // _writeElements('parameters', e.parameters, _writeFormalParameterFragments);
+      // _writeFragmentList('parameters', e, e.parameters, _writeFormalParameterFragments);
       // _writeConstantInitializer(e);
       // _writeNonSyntheticElement(e);
       // _writeFieldFormalParameterField(e);
@@ -779,6 +782,26 @@
     }
   }
 
+  void _writeFragmentList<E extends Fragment>(
+    String name,
+    Fragment? expectedEnclosingFragment,
+    List<E> elements,
+    void Function(E) write,
+  ) {
+    var filtered = elements.where(configuration.filter).toList();
+    if (filtered.isNotEmpty) {
+      _sink.writelnWithIndent(name);
+      _sink.withIndent(() {
+        for (var element in filtered) {
+          expect(element.enclosingFragment, expectedEnclosingFragment);
+          // TODO(brianwilkerson): Explicitly check the next/previous fragment
+          //  attributes and stop writing them to the dump.
+          write(element);
+        }
+      });
+    }
+  }
+
   void _writeFragmentName(Fragment f) {
     var name = _fragmentName(f);
     _sink.write(name);
@@ -871,13 +894,13 @@
 
     _sink.withIndent(() {
       _writeElementReference('reference', e);
-      _writeElementReference('enclosingElement', e.enclosingElement2);
       _writeDocumentation(e.documentationComment);
       _writeMetadata(e.metadata);
       _writeSinceSdkVersion(e.sinceSdkVersion);
 
       expect(e.typeParameters2, isEmpty);
-      _writeElements('parameters', e.parameters2, _writeFormalParameterElement);
+      _writeElementList(
+          'parameters', e, e.parameters2, _writeFormalParameterElement);
       // _writeReturnType(e.returnType);
       // _writeNonSyntheticElement(e);
       // writeLinking();
@@ -933,15 +956,14 @@
 
     _sink.withIndent(() {
       _writeFragmentReference('reference', f);
-      _writeFragmentReference('enclosingFragment', f.enclosingFragment);
       _writeDocumentation(f.documentationComment);
       _writeMetadata(f.metadata);
       _writeSinceSdkVersion(f.sinceSdkVersion);
       // _writeCodeRange(f);
 
       // expect(f.typeParameters2, isEmpty);
-      _writeElements(
-          'parameters', f.parameters2, _writeFormalParameterFragment);
+      _writeFragmentList(
+          'parameters', f, f.parameters2, _writeFormalParameterFragment);
       // _writeReturnType(f.returnType);
       // _writeNonSyntheticElement(f);
       // writeLinking();
@@ -992,13 +1014,12 @@
 
     _sink.withIndent(() {
       _writeElementReference('reference', e);
-      _writeEnclosingElement(e);
       _writeDocumentation(e.documentationComment);
       // _writeMetadata(e.metadata);
       _writeSinceSdkVersion(e.sinceSdkVersion);
       _writeCodeRange(e);
-      _writeElements(
-          'typeParameters', e.typeParameters2, _writeTypeParameterElement);
+      _writeElementList(
+          'typeParameters', e, e.typeParameters2, _writeTypeParameterElement);
       _writeMacroDiagnostics(e);
       _writeFragmentReference('firstFragment', e.firstFragment);
 
@@ -1034,19 +1055,19 @@
         _elementPrinter.writeTypeList('allSupertypes', sorted);
       }
 
-      _writeElements('fields', e.fields2, _writeFieldElement);
+      _writeElementList('fields', e, e.fields2, _writeFieldElement);
       if (e is InterfaceElement2) {
         var constructors = e.constructors2;
         if (e is MixinElement2) {
           expect(constructors, isEmpty);
         } else if (configuration.withConstructors) {
-          _writeElements(
-              'constructors', constructors, _writeConstructorElement);
+          _writeElementList(
+              'constructors', e, constructors, _writeConstructorElement);
         }
       }
-      _writeElements('getters', e.getters2, _writeGetterElement);
-      _writeElements('setters', e.setters2, _writeSetterElement);
-      _writeElements('methods', e.methods2, _writeMethodElement);
+      _writeElementList('getters', e, e.getters2, _writeGetterElement);
+      _writeElementList('setters', e, e.setters2, _writeSetterElement);
+      _writeElementList('methods', e, e.methods2, _writeMethodElement);
     });
 
     _assertNonSyntheticElementSelf(e);
@@ -1104,21 +1125,21 @@
       _writeFragmentReference('previousFragment', f.previousFragment);
       _writeFragmentReference('nextFragment', f.nextFragment);
 
-      _writeElements(
-          'typeParameters', f.typeParameters2, _writeTypeParameterFragment);
-      _writeElements('fields', f.fields2, _writeFieldFragment);
+      _writeFragmentList(
+          'typeParameters', f, f.typeParameters2, _writeTypeParameterFragment);
+      _writeFragmentList('fields', f, f.fields2, _writeFieldFragment);
       if (f is InterfaceFragment) {
         var constructors = f.constructors2;
         if (f is MixinElement2) {
           expect(constructors, isEmpty);
         } else if (configuration.withConstructors) {
-          _writeElements(
-              'constructors', constructors, _writeConstructorFragment);
+          _writeFragmentList(
+              'constructors', f, constructors, _writeConstructorFragment);
         }
       }
-      _writeElements('getters', f.getters, _writeGetterFragment);
-      _writeElements('setters', f.setters, _writeSetterFragment);
-      _writeElements('methods', f.methods2, _writeMethodFragment);
+      _writeFragmentList('getters', f, f.getters, _writeGetterFragment);
+      _writeFragmentList('setters', f, f.setters, _writeSetterFragment);
+      _writeFragmentList('methods', f, f.methods2, _writeMethodFragment);
     });
   }
 
@@ -1139,43 +1160,48 @@
           return configuration.withSyntheticDartCoreImport ||
               !import.isSynthetic;
         }).toList();
-        _writeElements(
+        _writeList(
           'libraryImports',
           imports,
           _writeLibraryImport,
         );
       }
-      _writeElements('prefixes', f.prefixes, _writePrefixElement);
-      // _writeElements(
+      _writeElementList('prefixes', f, f.prefixes, _writePrefixElement);
+      // _writeList(
       //     'libraryExports', f.libraryExports, _writeLibraryExportElement);
-      // _writeElements('parts', f.parts, _writePartElement);
+      // _writeList('parts', f.parts, _writePartElement);
 
-      _writeElements('classes', f.classes2, _writeInstanceFragment);
-      _writeElements('enums', f.enums2, _writeInstanceFragment);
-      _writeElements('extensions', f.extensions2, _writeInstanceFragment);
-      _writeElements(
+      _writeFragmentList('classes', f, f.classes2, _writeInstanceFragment);
+      _writeFragmentList('enums', f, f.enums2, _writeInstanceFragment);
+      _writeFragmentList(
+          'extensions', f, f.extensions2, _writeInstanceFragment);
+      _writeFragmentList(
         'extensionTypes',
+        f,
         f.extensionTypes2,
         _writeInstanceFragment,
       );
-      _writeElements('mixins', f.mixins2, _writeInstanceFragment);
-      // _writeElements('typeAliases', f.typeAliases, _writeTypeAliasElement);
-      _writeElements(
+      _writeFragmentList('mixins', f, f.mixins2, _writeInstanceFragment);
+      // _writeFragmentList('typeAliases', f, f.typeAliases, _writeTypeAliasElement);
+      _writeFragmentList(
         'topLevelVariables',
+        f,
         f.topLevelVariables2,
         _writeTopLevelVariableFragment,
       );
-      _writeElements(
+      _writeFragmentList(
         'getters',
+        f,
         f.getters,
         _writeGetterFragment,
       );
-      _writeElements(
+      _writeFragmentList(
         'setters',
+        f,
         f.setters,
         _writeSetterFragment,
       );
-      // _writeElements('functions', f.functions, _writeFunctionElement);
+      // _writeElementList('functions', f, f.functions, _writeFunctionElement);
     });
   }
 
@@ -1190,12 +1216,27 @@
 
     _sink.withIndent(() {
       _writeElementReference('reference', e);
-      // _writeEnclosingElement(e);
       _writeMetadata(e.metadata);
       // _writeNamespaceCombinators(e.combinators);
     });
   }
 
+  void _writeList<E extends Object>(
+    String name,
+    List<E> elements,
+    void Function(E) write,
+  ) {
+    var filtered = elements.where(configuration.filter).toList();
+    if (filtered.isNotEmpty) {
+      _sink.writelnWithIndent(name);
+      _sink.withIndent(() {
+        for (var element in filtered) {
+          write(element);
+        }
+      });
+    }
+  }
+
   void _writeMacroDiagnostics(Element2 e) {
     void writeTypeAnnotationLocation(TypeAnnotationLocation location) {
       switch (location) {
@@ -1482,9 +1523,10 @@
       _writeSinceSdkVersion(e.sinceSdkVersion);
       // _writeTypeInferenceError(e);
 
-      _writeElements(
-          'typeParameters', e.typeParameters2, _writeTypeParameterElement);
-      _writeElements('parameters', e.parameters2, _writeFormalParameterElement);
+      _writeElementList(
+          'typeParameters', e, e.typeParameters2, _writeTypeParameterElement);
+      _writeElementList(
+          'parameters', e, e.parameters2, _writeFormalParameterElement);
       // _writeReturnType(e.returnType);
       // _writeNonSyntheticElement(e);
       _writeMacroDiagnostics(e);
@@ -1515,17 +1557,16 @@
       _writeFragmentReference('reference', f);
       _writeFragmentReference('previousFragment', f.previousFragment);
       _writeFragmentReference('nextFragment', f.nextFragment);
-      _writeFragmentReference('enclosingFragment', f.enclosingFragment);
       _writeDocumentation(f.documentationComment);
       _writeMetadata(f.metadata);
       _writeSinceSdkVersion(f.sinceSdkVersion);
       _writeFragmentCodeRange(f);
       // _writeTypeInferenceError(f);
 
-      _writeElements(
-          'typeParameters', f.typeParameters2, _writeTypeParameterFragment);
-      _writeElements(
-          'parameters', f.parameters2, _writeFormalParameterFragment);
+      _writeFragmentList(
+          'typeParameters', f, f.typeParameters2, _writeTypeParameterFragment);
+      _writeFragmentList(
+          'parameters', f, f.parameters2, _writeFormalParameterFragment);
       // _writeReturnType(f.returnType);
       // _writeNonSyntheticElement(f);
       // _writeMacroDiagnostics(f);
@@ -1541,7 +1582,6 @@
 
     _sink.withIndent(() {
       _writeElementReference('reference', e);
-      // _writeEnclosingElement(e);
     });
   }
 
@@ -1586,13 +1626,13 @@
 
     _sink.withIndent(() {
       _writeElementReference('reference', e);
-      _writeElementReference('enclosingElement', e.enclosingElement2);
       _writeDocumentation(e.documentationComment);
       _writeMetadata(e.metadata);
       _writeSinceSdkVersion(e.sinceSdkVersion);
 
       expect(e.typeParameters2, isEmpty);
-      _writeElements('parameters', e.parameters2, _writeFormalParameterElement);
+      _writeElementList(
+          'parameters', e, e.parameters2, _writeFormalParameterElement);
       // _writeReturnType(e.returnType);
       // _writeNonSyntheticElement(e);
       // writeLinking();
@@ -1647,15 +1687,14 @@
 
     _sink.withIndent(() {
       _writeFragmentReference('reference', f);
-      _writeFragmentReference('enclosingFragment', f.enclosingFragment);
       _writeDocumentation(f.documentationComment);
       _writeMetadata(f.metadata);
       _writeSinceSdkVersion(f.sinceSdkVersion);
       // _writeCodeRange(f);
 
       // expect(f.typeParameters2, isEmpty);
-      _writeElements(
-          'parameters', f.parameters2, _writeFormalParameterFragment);
+      _writeFragmentList(
+          'parameters', f, f.parameters2, _writeFormalParameterFragment);
       // _writeReturnType(f.returnType);
       // _writeNonSyntheticElement(f);
       // writeLinking();
@@ -1707,7 +1746,6 @@
 
     _sink.withIndent(() {
       _writeElementReference('reference', e);
-      _writeEnclosingElement(e);
       _writeDocumentation(e.documentationComment);
       _writeMetadata(e.metadata);
       _writeSinceSdkVersion(e.sinceSdkVersion);
@@ -1766,7 +1804,6 @@
 
     _sink.withIndent(() {
       _writeFragmentReference('reference', f);
-      _writeFragmentReference('enclosingFragment', f.enclosingFragment);
       _writeDocumentation(f.documentationComment);
       _writeMetadata(f.metadata);
       _writeSinceSdkVersion(f.sinceSdkVersion);
@@ -1793,7 +1830,7 @@
     //     _sink.withIndent(() {
     //       // TODO(brianwilkerson): We need to define `parameters2` to return
     //       //  `List<ParmaeterElement2>`.
-    //       _writeElements('parameters',  type.parameters2, _writeFormalParameterFragment);
+    //       _writeElements('parameters',  type, type.parameters2, _writeFormalParameterFragment);
     //     });
     //   }
     // }
@@ -2187,6 +2224,22 @@
     }
   }
 
+  void _writeElements<T extends Object>(
+    String name,
+    List<T> elements,
+    void Function(T) write,
+  ) {
+    var filtered = elements.where(configuration.filter).toList();
+    if (filtered.isNotEmpty) {
+      _sink.writelnWithIndent(name);
+      _sink.withIndent(() {
+        for (var element in filtered) {
+          write(element);
+        }
+      });
+    }
+  }
+
   void _writeEnclosingElement(ElementImpl e) {
     _elementPrinter.writeNamedElement(
       'enclosingElement',
diff --git a/pkg/analyzer/test/src/summary/elements/class_test.dart b/pkg/analyzer/test/src/summary/elements/class_test.dart
index 308b534..701063c 100644
--- a/pkg/analyzer/test/src/summary/elements/class_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/class_test.dart
@@ -49,11 +49,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -90,11 +88,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     base class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -131,11 +127,9 @@
           constructors
             const new @16
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const new
@@ -172,11 +166,9 @@
           constructors
             external const new @25
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const new
@@ -220,12 +212,10 @@
           constructors
             new @34
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /**\n   * Docs\n   */
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -265,13 +255,11 @@
           constructors
             foo @12
               reference: <testLibraryFragment>::@class::C::@constructor::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 11
               nameEnd: 15
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         foo
@@ -316,11 +304,9 @@
           constructors
             new @16
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -360,11 +346,9 @@
           constructors
             new @10
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -401,11 +385,9 @@
           constructors
             external new @19
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -442,11 +424,9 @@
           constructors
             factory new @18
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         factory new
@@ -505,32 +485,26 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @21
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -546,12 +520,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -609,32 +581,26 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @21
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -650,12 +616,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -713,32 +677,26 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @21
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -754,12 +712,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -825,32 +781,26 @@
           fields
             x @16
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @21
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -870,12 +820,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -941,32 +889,26 @@
           fields
             x @16
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @21
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -986,12 +928,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -1060,32 +1000,26 @@
           fields
             f @23
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
               setter2: <testLibraryFragment>::@class::C::@setter::f
           constructors
             new @28
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::C::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _f @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic Function()
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -1105,12 +1039,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _f
               reference: <none>
@@ -1185,52 +1117,42 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::C::@field::x::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x::@def::0
               setter2: <testLibraryFragment>::@class::C::@setter::x::@def::0
             x @35
               reference: <testLibraryFragment>::@class::C::@field::x::@def::1
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x::@def::1
               setter2: <testLibraryFragment>::@class::C::@setter::x::@def::1
           constructors
             new @10
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::C
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x::@def::1
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x::@def::1
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x::@def::0
           getter: <none>
           setter: <none>
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: String
           firstFragment: <testLibraryFragment>::@class::C::@field::x::@def::1
           getter: <none>
@@ -1246,16 +1168,13 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x::@def::0
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x::@def::1
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -1263,7 +1182,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::x::@def::0
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -1305,11 +1223,9 @@
           constructors
             new @10
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -1371,32 +1287,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @17
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: num
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -1412,12 +1322,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -1475,32 +1383,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @17
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: num
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -1516,12 +1418,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -1579,32 +1479,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @17
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: num
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -1620,12 +1514,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -1683,32 +1575,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @17
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -1724,12 +1610,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -1787,32 +1671,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @17
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -1828,12 +1706,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -1891,32 +1767,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @17
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -1932,12 +1802,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -1996,32 +1864,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @17
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -2037,12 +1899,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -2105,32 +1965,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @17
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -2146,12 +2000,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -2209,32 +2061,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @17
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -2250,12 +2096,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -2317,32 +2161,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @17
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -2358,12 +2196,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -2408,11 +2244,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -2476,7 +2310,6 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 AssertInitializer
                   assertKeyword: assert @29
@@ -2497,7 +2330,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const new
@@ -2565,7 +2397,6 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 AssertInitializer
                   assertKeyword: assert @29
@@ -2589,7 +2420,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const new
@@ -2655,12 +2485,10 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             const new @29
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 ConstructorFieldInitializer
                   fieldName: SimpleIdentifier
@@ -2674,16 +2502,13 @@
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -2694,7 +2519,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -2766,12 +2590,10 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             const new @29
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 ConstructorFieldInitializer
                   fieldName: SimpleIdentifier
@@ -2792,16 +2614,13 @@
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -2812,7 +2631,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -2878,12 +2696,10 @@
           fields
             promotable _f @22
               reference: <testLibraryFragment>::@class::A::@field::_f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_f
           constructors
             const new @34
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               constantInitializers
                 ConstructorFieldInitializer
                   fieldName: SimpleIdentifier
@@ -2898,16 +2714,13 @@
           getters
             get _f @-1
               reference: <testLibraryFragment>::@class::A::@getter::_f
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::_f
           getter: <none>
@@ -2922,7 +2735,6 @@
       getters
         synthetic get _f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_f
 ''');
   }
@@ -2992,12 +2804,10 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             const new @36
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 ConstructorFieldInitializer
                   fieldName: SimpleIdentifier
@@ -3020,16 +2830,13 @@
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: Object
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -3044,7 +2851,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -3114,12 +2920,10 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             const new @29
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 ConstructorFieldInitializer
                   fieldName: SimpleIdentifier
@@ -3142,16 +2946,13 @@
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -3166,7 +2967,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -3264,16 +3064,13 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @34
           reference: <testLibraryFragment>::@class::B
           constructors
             const new @46
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
             const f @70
               reference: <testLibraryFragment>::@class::B::@constructor::f
-              enclosingFragment: <testLibraryFragment>::@class::B
               periodOffset: 69
               nameEnd: 71
               constantInitializers
@@ -3315,7 +3112,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -3325,7 +3121,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         const new
@@ -3402,13 +3197,11 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @50
           reference: <testLibraryFragment>::@class::B
           constructors
             const new @72
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @78
@@ -3426,7 +3219,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -3438,7 +3230,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -3514,7 +3305,6 @@
           constructors
             const aaa @20
               reference: <testLibraryFragment>::@class::A::@constructor::aaa
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 19
               nameEnd: 23
         class C @40
@@ -3522,7 +3312,6 @@
           constructors
             const new @62
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @68
@@ -3543,7 +3332,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const aaa
@@ -3555,7 +3343,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::aaa
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A
       constructors
@@ -3624,7 +3411,6 @@
           constructors
             const _ @20
               reference: <testLibraryFragment>::@class::A::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 19
               nameEnd: 21
         class B @33
@@ -3632,7 +3418,6 @@
           constructors
             const new @55
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @61
@@ -3649,7 +3434,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const _
@@ -3657,7 +3441,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::_
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -3746,7 +3529,6 @@
           constructors
             const aaa @20
               reference: <testLibraryFragment>::@class::A::@constructor::aaa
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 19
               nameEnd: 23
         class C @45
@@ -3754,7 +3536,6 @@
           constructors
             const new @67
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @73
@@ -3785,7 +3566,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const aaa
@@ -3800,7 +3580,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::aaa
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A
       constructors
@@ -3871,13 +3650,11 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @36
           reference: <testLibraryFragment>::@class::C
           constructors
             const ccc @60
               reference: <testLibraryFragment>::@class::C::@constructor::ccc
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 59
               nameEnd: 63
               constantInitializers
@@ -3895,7 +3672,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -3907,7 +3683,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A
       constructors
@@ -3973,10 +3748,8 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
             const empty @52
               reference: <testLibraryFragment>::@class::A::@constructor::empty
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 51
               nameEnd: 57
               constantInitializers
@@ -3996,7 +3769,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -4075,7 +3847,6 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 RedirectingConstructorInvocation
                   thisKeyword: this @24
@@ -4097,13 +3868,11 @@
               redirectedConstructor: <testLibraryFragment>::@class::C::@constructor::named
             const named @56
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 55
               nameEnd: 61
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const new
@@ -4194,7 +3963,6 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 RedirectingConstructorInvocation
                   thisKeyword: this @24
@@ -4224,13 +3992,11 @@
               redirectedConstructor: <testLibraryFragment>::@class::C::@constructor::named
             const named @55
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 54
               nameEnd: 60
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const new
@@ -4307,7 +4073,6 @@
           constructors
             const named @20
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 19
               nameEnd: 25
               constantInitializers
@@ -4326,11 +4091,9 @@
               redirectedConstructor: <testLibraryFragment>::@class::C::@constructor::new
             const new @54
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const named
@@ -4408,18 +4171,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @35
           reference: <testLibraryFragment>::@class::B
           constructors
             new @51
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -4431,7 +4191,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -4502,18 +4261,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @31
           reference: <testLibraryFragment>::@class::B
           constructors
             new @47
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -4525,7 +4281,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -4592,18 +4347,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @32
           reference: <testLibraryFragment>::@class::B
           constructors
             new @48
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -4615,7 +4367,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -4725,18 +4476,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @61
           reference: <testLibraryFragment>::@class::B
           constructors
             new @77
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -4751,7 +4499,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -4834,18 +4581,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @37
           reference: <testLibraryFragment>::@class::B
           constructors
             new @53
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -4857,7 +4601,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -4926,18 +4669,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @42
           reference: <testLibraryFragment>::@class::B
           constructors
             new @58
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -4949,7 +4689,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -5017,18 +4756,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @31
           reference: <testLibraryFragment>::@class::B
           constructors
             new @47
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -5040,7 +4776,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -5116,18 +4851,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @41
           reference: <testLibraryFragment>::@class::B
           constructors
             new @57
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -5142,7 +4874,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -5238,18 +4969,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @61
           reference: <testLibraryFragment>::@class::B
           constructors
             new @77
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -5264,7 +4992,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -5347,18 +5074,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @37
           reference: <testLibraryFragment>::@class::B
           constructors
             new @53
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -5370,7 +5094,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -5446,18 +5169,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @41
           reference: <testLibraryFragment>::@class::B
           constructors
             new @57
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -5472,7 +5192,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -5567,25 +5286,21 @@
           constructors
             new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @40
           reference: <testLibraryFragment>::@class::C
           constructors
             new @56
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::B::@constructor::new
         class B @77
           reference: <testLibraryFragment>::@class::B
           constructors
             new @93
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -5597,7 +5312,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: B
       constructors
@@ -5611,7 +5325,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -5704,13 +5417,11 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @31
           reference: <testLibraryFragment>::@class::C
           constructors
             new @55
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::B::@constructor::new
                 substitution: {T: String}
@@ -5721,12 +5432,10 @@
           constructors
             new @95
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -5738,7 +5447,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: B<String>
       constructors
@@ -5752,7 +5460,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -5816,18 +5523,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @18
           reference: <testLibraryFragment>::@class::B
           constructors
             new @34
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -5835,7 +5539,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -5903,18 +5606,15 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @41
           reference: <testLibraryFragment>::@class::B
           constructors
             new @57
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -5926,7 +5626,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -5974,11 +5673,9 @@
           constructors
             new @10
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -6047,11 +5744,9 @@
           constructors
             factory new @20
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: <testLibraryFragment>::@class::D::@constructor::named
             _ @39
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 38
               nameEnd: 40
         class D @52
@@ -6059,14 +5754,12 @@
           constructors
             named @70
               reference: <testLibraryFragment>::@class::D::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::D
               periodOffset: 69
               nameEnd: 75
               superConstructor: <testLibraryFragment>::@class::C::@constructor::_
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         factory new
@@ -6078,7 +5771,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::_
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       supertype: C
       constructors
@@ -6159,13 +5851,11 @@
           constructors
             factory new @26
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::D::@constructor::named
                 substitution: {T: U, U: T}
             _ @51
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 50
               nameEnd: 52
         class D @64
@@ -6176,7 +5866,6 @@
           constructors
             named @94
               reference: <testLibraryFragment>::@class::D::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::D
               periodOffset: 93
               nameEnd: 99
               superConstructor: ConstructorMember
@@ -6185,7 +5874,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -6200,7 +5888,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::_
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -6295,13 +5982,11 @@
           constructors
             factory new @53
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               redirectedConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::C::@constructor::named
                 substitution: {T: U, U: T}
             _ @78
               reference: <testLibraryFragment>::@class::B::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::B
               periodOffset: 77
               nameEnd: 79
         class C @91
@@ -6312,13 +5997,11 @@
           constructors
             named @121
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 120
               nameEnd: 126
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -6333,7 +6016,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::_
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -6406,17 +6088,14 @@
           constructors
             factory new @39
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: package:test/foo.dart::<fragment>::@class::D::@constructor::named
             _ @58
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 57
               nameEnd: 59
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         factory new
@@ -6495,19 +6174,16 @@
           constructors
             factory new @45
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: ConstructorMember
                 base: package:test/foo.dart::<fragment>::@class::D::@constructor::named
                 substitution: {T: U, U: T}
             _ @70
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 69
               nameEnd: 71
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -6592,17 +6268,14 @@
           constructors
             factory new @46
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: package:test/foo.dart::<fragment>::@class::D::@constructor::named
             _ @69
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 68
               nameEnd: 70
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         factory new
@@ -6694,19 +6367,16 @@
           constructors
             factory new @52
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: ConstructorMember
                 base: package:test/foo.dart::<fragment>::@class::D::@constructor::named
                 substitution: {T: U, U: T}
             _ @81
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 80
               nameEnd: 82
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -6759,11 +6429,9 @@
           constructors
             factory new @23
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibraryFragment>::@class::C
@@ -6817,7 +6485,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class C @17
           reference: <testLibraryFragment>::@class::C
           typeParameters
@@ -6825,11 +6492,9 @@
           constructors
             factory new @34
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -6837,7 +6502,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibraryFragment>::@class::C
@@ -6899,11 +6563,9 @@
           constructors
             factory new @20
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: <testLibraryFragment>::@class::D::@constructor::new
             _ @33
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 32
               nameEnd: 34
         class D @46
@@ -6911,12 +6573,10 @@
           constructors
             new @62
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
               superConstructor: <testLibraryFragment>::@class::C::@constructor::_
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         factory new
@@ -6928,7 +6588,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::_
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       supertype: C
       constructors
@@ -7007,13 +6666,11 @@
           constructors
             factory new @26
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::D::@constructor::new
                 substitution: {T: U, U: T}
             _ @45
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 44
               nameEnd: 46
         class D @58
@@ -7024,14 +6681,12 @@
           constructors
             new @86
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::C::@constructor::_
                 substitution: {T: U, U: T}
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -7046,7 +6701,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::_
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -7135,14 +6789,12 @@
           constructors
             factory new @53
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               redirectedConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::C::@constructor::new
                 substitution: {T: U, U: T}
           methods
             B_ @70
               reference: <testLibraryFragment>::@class::B::@method::B_
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @84
           reference: <testLibraryFragment>::@class::C
           typeParameters
@@ -7151,11 +6803,9 @@
           constructors
             new @112
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -7171,7 +6821,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::B_
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -7240,17 +6889,14 @@
           constructors
             factory new @39
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: package:test/foo.dart::<fragment>::@class::D::@constructor::new
             _ @52
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 51
               nameEnd: 53
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         factory new
@@ -7329,19 +6975,16 @@
           constructors
             factory new @45
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: ConstructorMember
                 base: package:test/foo.dart::<fragment>::@class::D::@constructor::new
                 substitution: {T: U, U: T}
             _ @64
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 63
               nameEnd: 65
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -7414,17 +7057,14 @@
           constructors
             factory new @39
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: package:test/foo.dart::<fragment>::@class::B::@constructor::new
             _ @52
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 51
               nameEnd: 53
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         factory new
@@ -7506,17 +7146,14 @@
           constructors
             factory new @46
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: package:test/foo.dart::<fragment>::@class::D::@constructor::new
             _ @63
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 62
               nameEnd: 64
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         factory new
@@ -7608,19 +7245,16 @@
           constructors
             factory new @52
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: ConstructorMember
                 base: package:test/foo.dart::<fragment>::@class::D::@constructor::new
                 substitution: {T: U, U: T}
             _ @75
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 74
               nameEnd: 76
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -7706,17 +7340,14 @@
           constructors
             factory new @46
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: package:test/foo.dart::<fragment>::@class::B::@constructor::new
             _ @63
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 62
               nameEnd: 64
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         factory new
@@ -7766,11 +7397,9 @@
           constructors
             factory new @23
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibraryFragment>::@class::C
@@ -7837,11 +7466,9 @@
           constructors
             factory new @35
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               redirectedConstructor: <testLibraryFragment>::@class::C::@constructor::new
             _ @48
               reference: <testLibraryFragment>::@class::B::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::B
               periodOffset: 47
               nameEnd: 49
         class C @61
@@ -7849,12 +7476,10 @@
           constructors
             new @77
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::B::@constructor::_
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         factory new
@@ -7866,7 +7491,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::_
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: B
       constructors
@@ -7928,12 +7552,10 @@
           constructors
             const named @20
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 19
               nameEnd: 25
             const new @37
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 RedirectingConstructorInvocation
                   thisKeyword: this @43
@@ -7950,7 +7572,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const named
@@ -8019,12 +7640,10 @@
           constructors
             const named @23
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 22
               nameEnd: 28
             const new @40
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 RedirectingConstructorInvocation
                   thisKeyword: this @46
@@ -8041,7 +7660,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -8095,17 +7713,14 @@
           constructors
             named @14
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 13
               nameEnd: 19
             new @25
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               redirectedConstructor: <testLibraryFragment>::@class::C::@constructor::named
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         named
@@ -8164,10 +7779,8 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
             const named @33
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 32
               nameEnd: 38
               constantInitializers
@@ -8181,7 +7794,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const new
@@ -8245,10 +7857,8 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
             const named @36
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 35
               nameEnd: 41
               constantInitializers
@@ -8262,7 +7872,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -8316,17 +7925,14 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
             named @21
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 20
               nameEnd: 26
               redirectedConstructor: <testLibraryFragment>::@class::C::@constructor::new
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -8395,7 +8001,6 @@
           constructors
             named @17
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 16
               nameEnd: 22
         class B @37
@@ -8403,14 +8008,12 @@
           constructors
             new @58
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::named
                 substitution: {T: int}
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -8424,7 +8027,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::named
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A<int>
       constructors
@@ -8481,7 +8083,6 @@
           constructors
             named @14
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 13
               nameEnd: 19
         class B @31
@@ -8489,12 +8090,10 @@
           constructors
             new @47
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::named
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         named
@@ -8502,7 +8101,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::named
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -8555,18 +8153,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @17
           reference: <testLibraryFragment>::@class::B
           constructors
             new @33
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -8574,7 +8169,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -8627,18 +8221,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @17
           reference: <testLibraryFragment>::@class::B
           constructors
             new @33
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -8646,7 +8237,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -8697,18 +8287,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @17
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -8716,7 +8303,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -8757,11 +8343,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -8872,12 +8456,10 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             const new @29
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 ConstructorFieldInitializer
                   fieldName: SimpleIdentifier
@@ -8900,18 +8482,15 @@
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @58
           reference: <testLibraryFragment>::@class::D
           fields
             x @70
               reference: <testLibraryFragment>::@class::D::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::D
               getter2: <testLibraryFragment>::@class::D::@getter::x
           constructors
             const new @81
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
               constantInitializers
                 ConstructorFieldInitializer
                   fieldName: SimpleIdentifier
@@ -8934,16 +8513,13 @@
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::D::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -8954,16 +8530,13 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::D::@field::x
           getter: <none>
@@ -8974,7 +8547,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           firstFragment: <testLibraryFragment>::@class::D::@getter::x
 ''');
   }
@@ -9043,40 +8615,32 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             new @23
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @50
           reference: <testLibraryFragment>::@class::D
           fields
             x @62
               reference: <testLibraryFragment>::@class::D::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::D
               getter2: <testLibraryFragment>::@class::D::@getter::x
           constructors
             new @67
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::D::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -9087,16 +8651,13 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::D::@field::x
           getter: <none>
@@ -9107,7 +8668,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           firstFragment: <testLibraryFragment>::@class::D::@getter::x
 ''');
   }
@@ -9148,13 +8708,11 @@
           constructors
             foo @14
               reference: <testLibraryFragment>::@class::C::@constructor::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 13
               nameEnd: 17
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         foo
@@ -9197,11 +8755,9 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -9246,13 +8802,11 @@
           constructors
             new @14
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 13
               nameEnd: 17
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -9294,11 +8848,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /**\n * Docs\n */
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -9405,35 +8957,29 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @79
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @122
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @173
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @207
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       documentationComment: /**\n * bbb\n */
       firstFragment: <testLibraryFragment>::@class::A
       constructors
@@ -9442,7 +8988,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       documentationComment: /// bbb\n/// ccc
       firstFragment: <testLibraryFragment>::@class::B
       constructors
@@ -9451,7 +8996,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /**\n * ccc\n */
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -9460,7 +9004,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       documentationComment: /// ddd
       firstFragment: <testLibraryFragment>::@class::D
       constructors
@@ -9469,7 +9012,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       documentationComment: /**\n * aaa\n */
       firstFragment: <testLibraryFragment>::@class::E
       constructors
@@ -9512,11 +9054,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /// first\n/// second\n/// third
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -9576,23 +9116,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @59
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @70
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /**\n * Docs referring to [D] and [E]\n */
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -9601,7 +9137,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -9609,7 +9144,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -9647,11 +9181,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /**\n * Docs\n */
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -9695,11 +9227,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /**\n * Docs\n */
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -9875,46 +9405,38 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::BeforeMeta::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::BeforeMeta
         class BeforeMetaNamed @117
           reference: <testLibraryFragment>::@class::BeforeMetaNamed
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::BeforeMetaNamed::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::BeforeMetaNamed
         class AfterMeta @185
           reference: <testLibraryFragment>::@class::AfterMeta
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::AfterMeta::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::AfterMeta
         class AroundMeta @247
           reference: <testLibraryFragment>::@class::AroundMeta
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::AroundMeta::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::AroundMeta
         class DocBeforeMetaNotDocAfter @319
           reference: <testLibraryFragment>::@class::DocBeforeMetaNotDocAfter
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::DocBeforeMetaNotDocAfter::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::DocBeforeMetaNotDocAfter
         class Annotation @354
           reference: <testLibraryFragment>::@class::Annotation
           constructors
             const new @375
               reference: <testLibraryFragment>::@class::Annotation::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::Annotation
             const named @408
               reference: <testLibraryFragment>::@class::Annotation::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::Annotation
               periodOffset: 407
               nameEnd: 413
   classes
     class BeforeMeta
       reference: <testLibraryFragment>::@class::BeforeMeta
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1\n/// Comment 2
       firstFragment: <testLibraryFragment>::@class::BeforeMeta
       constructors
@@ -9923,7 +9445,6 @@
           firstFragment: <testLibraryFragment>::@class::BeforeMeta::@constructor::new
     class BeforeMetaNamed
       reference: <testLibraryFragment>::@class::BeforeMetaNamed
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1\n/// Comment 2
       firstFragment: <testLibraryFragment>::@class::BeforeMetaNamed
       constructors
@@ -9932,7 +9453,6 @@
           firstFragment: <testLibraryFragment>::@class::BeforeMetaNamed::@constructor::new
     class AfterMeta
       reference: <testLibraryFragment>::@class::AfterMeta
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1\n/// Comment 2
       firstFragment: <testLibraryFragment>::@class::AfterMeta
       constructors
@@ -9941,7 +9461,6 @@
           firstFragment: <testLibraryFragment>::@class::AfterMeta::@constructor::new
     class AroundMeta
       reference: <testLibraryFragment>::@class::AroundMeta
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 2
       firstFragment: <testLibraryFragment>::@class::AroundMeta
       constructors
@@ -9950,7 +9469,6 @@
           firstFragment: <testLibraryFragment>::@class::AroundMeta::@constructor::new
     class DocBeforeMetaNotDocAfter
       reference: <testLibraryFragment>::@class::DocBeforeMetaNotDocAfter
-      enclosingElement2: <testLibrary>
       documentationComment: /// Doc comment.
       firstFragment: <testLibraryFragment>::@class::DocBeforeMetaNotDocAfter
       constructors
@@ -9959,7 +9477,6 @@
           firstFragment: <testLibraryFragment>::@class::DocBeforeMetaNotDocAfter::@constructor::new
     class Annotation
       reference: <testLibraryFragment>::@class::Annotation
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::Annotation
       constructors
         const new
@@ -10020,32 +9537,26 @@
           fields
             abstract i @34
               reference: <testLibraryFragment>::@class::C::@field::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::i
               setter2: <testLibraryFragment>::@class::C::@setter::i
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get i @-1
               reference: <testLibraryFragment>::@class::C::@getter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set i= @-1
               reference: <testLibraryFragment>::@class::C::@setter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _i @-1
   classes
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::i
           getter: <none>
@@ -10057,12 +9568,10 @@
       getters
         synthetic abstract get i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::i
       setters
         synthetic abstract set i=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _i
               reference: <none>
@@ -10114,25 +9623,20 @@
           fields
             i @27
               reference: <testLibraryFragment>::@class::C::@field::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::i
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get i @-1
               reference: <testLibraryFragment>::@class::C::@getter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static const i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::i
           getter: <none>
@@ -10143,7 +9647,6 @@
       getters
         synthetic static get i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::i
 ''');
   }
@@ -10192,25 +9695,20 @@
           fields
             i @32
               reference: <testLibraryFragment>::@class::C::@field::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::i
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get i @-1
               reference: <testLibraryFragment>::@class::C::@getter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static late const i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::i
           getter: <none>
@@ -10221,7 +9719,6 @@
       getters
         synthetic static get i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::i
 ''');
   }
@@ -10274,32 +9771,26 @@
           fields
             covariant x @26
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -10311,12 +9802,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional covariant _x
               reference: <none>
@@ -10377,32 +9866,26 @@
           fields
             x @38
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -10414,12 +9897,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -10499,46 +9980,37 @@
           fields
             foo @16
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo::@def::0
               setter2: <testLibraryFragment>::@class::C::@setter::foo
             foo @-1
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo::@def::1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::C::@getter::foo::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::C
             get foo @35
               reference: <testLibraryFragment>::@class::C::@getter::foo::@def::1
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::C::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _foo @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
           setter: <none>
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
@@ -10549,16 +10021,13 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo::@def::0
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo::@def::1
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _foo
               reference: <none>
@@ -10641,48 +10110,39 @@
           fields
             foo @16
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo
               setter2: <testLibraryFragment>::@class::C::@setter::foo::@def::0
             foo @-1
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::foo::@def::1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::C::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::C::@setter::foo::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _foo @-1
             set foo= @31
               reference: <testLibraryFragment>::@class::C::@setter::foo::@def::1
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _ @39
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
           setter: <none>
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           setter: <none>
@@ -10693,12 +10153,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _foo
               reference: <none>
@@ -10706,7 +10164,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::foo::@def::0
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _
               reference: <none>
@@ -10764,32 +10221,26 @@
           fields
             external i @34
               reference: <testLibraryFragment>::@class::C::@field::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::i
               setter2: <testLibraryFragment>::@class::C::@setter::i
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get i @-1
               reference: <testLibraryFragment>::@class::C::@getter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set i= @-1
               reference: <testLibraryFragment>::@class::C::@setter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _i @-1
   classes
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::i
           getter: <none>
@@ -10801,12 +10252,10 @@
       getters
         synthetic get i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::i
       setters
         synthetic set i=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _i
               reference: <none>
@@ -10863,25 +10312,20 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             const new @34
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -10892,7 +10336,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -11000,26 +10443,21 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @34
           reference: <testLibraryFragment>::@class::B
           fields
             f @46
               reference: <testLibraryFragment>::@class::B::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::f
           constructors
             const new @93
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::B::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -11029,12 +10467,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: A<int Function(double)>
           firstFragment: <testLibraryFragment>::@class::B::@field::f
           getter: <none>
@@ -11045,7 +10481,6 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::f
 ''');
   }
@@ -11093,25 +10528,20 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -11122,7 +10552,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -11190,32 +10619,26 @@
           fields
             foo @22
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             new @29
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @48
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 newValue @56
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -11231,12 +10654,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional newValue
               reference: <none>
@@ -11314,22 +10735,18 @@
           fields
             v @24
               reference: <testLibraryFragment>::@class::C::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::v
               setter2: <testLibraryFragment>::@class::C::@setter::v
           constructors
             new @27
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::D::@constructor::new
           getters
             get v @-1
               reference: <testLibraryFragment>::@class::C::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set v= @-1
               reference: <testLibraryFragment>::@class::C::@setter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _v @-1
         class D @55
@@ -11337,26 +10754,21 @@
           fields
             v @-1
               reference: <testLibraryFragment>::@class::D::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::D
               getter2: <testLibraryFragment>::@class::D::@getter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           getters
             get v @67
               reference: <testLibraryFragment>::@class::D::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       fields
         v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::v
           getter: <none>
@@ -11373,12 +10785,10 @@
       getters
         synthetic get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::v
       setters
         synthetic set v=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _v
               reference: <none>
@@ -11386,12 +10796,10 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::v
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       fields
         synthetic v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: int
           firstFragment: <testLibraryFragment>::@class::D::@field::v
           getter: <none>
@@ -11402,7 +10810,6 @@
       getters
         abstract get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           firstFragment: <testLibraryFragment>::@class::D::@getter::v
 ''');
   }
@@ -11452,32 +10859,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -11489,12 +10890,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -11548,32 +10947,26 @@
           fields
             x @19
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         late x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -11585,12 +10978,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -11645,32 +11036,26 @@
           fields
             v @14
               reference: <testLibraryFragment>::@class::C::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::v
               setter2: <testLibraryFragment>::@class::C::@setter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get v @-1
               reference: <testLibraryFragment>::@class::C::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set v= @-1
               reference: <testLibraryFragment>::@class::C::@setter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _v @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: num
           firstFragment: <testLibraryFragment>::@class::C::@field::v
           getter: <none>
@@ -11682,12 +11067,10 @@
       getters
         synthetic get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::v
       setters
         synthetic set v=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _v
               reference: <none>
@@ -11742,32 +11125,26 @@
           fields
             v @14
               reference: <testLibraryFragment>::@class::C::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::v
               setter2: <testLibraryFragment>::@class::C::@setter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get v @-1
               reference: <testLibraryFragment>::@class::C::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set v= @-1
               reference: <testLibraryFragment>::@class::C::@setter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _v @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::v
           getter: <none>
@@ -11779,12 +11156,10 @@
       getters
         synthetic get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::v
       setters
         synthetic set v=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _v
               reference: <none>
@@ -11858,22 +11233,18 @@
           fields
             v @24
               reference: <testLibraryFragment>::@class::C::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::v
               setter2: <testLibraryFragment>::@class::C::@setter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::D::@constructor::new
           getters
             get v @-1
               reference: <testLibraryFragment>::@class::C::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set v= @-1
               reference: <testLibraryFragment>::@class::C::@setter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _v @-1
         class D @44
@@ -11881,26 +11252,21 @@
           fields
             v @-1
               reference: <testLibraryFragment>::@class::D::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::D
               getter2: <testLibraryFragment>::@class::D::@getter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           getters
             get v @56
               reference: <testLibraryFragment>::@class::D::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       fields
         v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::v
           getter: <none>
@@ -11913,12 +11279,10 @@
       getters
         synthetic get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::v
       setters
         synthetic set v=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _v
               reference: <none>
@@ -11926,12 +11290,10 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::v
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       fields
         synthetic v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: int
           firstFragment: <testLibraryFragment>::@class::D::@field::v
           getter: <none>
@@ -11942,7 +11304,6 @@
       getters
         abstract get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           firstFragment: <testLibraryFragment>::@class::D::@getter::v
 ''');
   }
@@ -12040,50 +11401,40 @@
           fields
             f @-1
               reference: <testLibraryFragment>::@class::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::f
           constructors
             const new @40
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get f @61
               reference: <testLibraryFragment>::@class::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @72
           reference: <testLibraryFragment>::@class::B
           fields
             f @107
               reference: <testLibraryFragment>::@class::B::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::f
           constructors
             const new @94
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::B::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::B
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: List<int>
           firstFragment: <testLibraryFragment>::@class::A::@field::f
           getter: <none>
@@ -12094,17 +11445,14 @@
       getters
         abstract get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::f
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: List<int>
           firstFragment: <testLibraryFragment>::@class::B::@field::f
           getter: <none>
@@ -12116,19 +11464,16 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::f
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -12179,32 +11524,26 @@
           fields
             v @21
               reference: <testLibraryFragment>::@class::C::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::v
               setter2: <testLibraryFragment>::@class::C::@setter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get v @-1
               reference: <testLibraryFragment>::@class::C::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set v= @-1
               reference: <testLibraryFragment>::@class::C::@setter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _v @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::v
           getter: <none>
@@ -12216,12 +11555,10 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::v
       setters
         synthetic static set v=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _v
               reference: <none>
@@ -12301,41 +11638,33 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             const new @27
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @45
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @58
           reference: <testLibraryFragment>::@class::B
           fields
             foo @93
               reference: <testLibraryFragment>::@class::B::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::foo
           constructors
             const new @80
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::B::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: double
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -12346,17 +11675,14 @@
       getters
         abstract get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: double
           firstFragment: <testLibraryFragment>::@class::B::@field::foo
           getter: <none>
@@ -12368,7 +11694,6 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::foo
 ''');
   }
@@ -12417,17 +11742,14 @@
           fields
             _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -12442,16 +11764,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -12462,7 +11781,6 @@
       getters
         get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
   fieldNameNonPromotabilityInfo
     _foo
@@ -12511,17 +11829,14 @@
           fields
             promotable _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -12536,16 +11851,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -12556,7 +11868,6 @@
       getters
         abstract get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
 ''');
   }
@@ -12613,19 +11924,16 @@
           fields
             _foo @38
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -12640,16 +11948,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B
       fields
         synthetic _foo
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@class::B
           type: int?
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B::@field::_foo
           getter: <none>
@@ -12660,7 +11965,6 @@
       getters
         get _foo
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@class::B
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B::@getter::_foo
   fieldNameNonPromotabilityInfo
     _foo
@@ -12709,17 +12013,14 @@
           fields
             promotable _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -12734,16 +12035,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic static _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -12754,7 +12052,6 @@
       getters
         static get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
 ''');
   }
@@ -12803,17 +12100,14 @@
           fields
             _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -12828,16 +12122,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -12849,12 +12140,10 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
       setters
         synthetic set _foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional __foo
               reference: <none>
@@ -12907,17 +12196,14 @@
           fields
             promotable _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -12932,16 +12218,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         static _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -12953,12 +12236,10 @@
       getters
         synthetic static get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
       setters
         synthetic static set _foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional __foo
               reference: <none>
@@ -13007,17 +12288,14 @@
           fields
             promotable _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -13032,16 +12310,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic _field
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_field
           setter: <none>
@@ -13052,7 +12327,6 @@
       setters
         set _field=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -13098,17 +12372,14 @@
           fields
             _foo @39
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -13123,7 +12394,6 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
 ''');
   }
@@ -13177,17 +12447,14 @@
           fields
             _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -13202,16 +12469,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -13222,11 +12486,9 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /// Implicitly implements `_foo` as a getter that forwards to [noSuchMethod].
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -13321,14 +12583,12 @@
           fields
             promotable _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
         class B @90
           reference: <testLibraryFragment>::@class::B
           fields
             promotable _foo @107
               reference: <testLibraryFragment>::@class::B::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::_foo
       mixins
         mixin M @54
@@ -13336,17 +12596,14 @@
           fields
             promotable _foo @71
               reference: <testLibraryFragment>::@mixin::M::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -13361,16 +12618,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -13381,11 +12635,9 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /// `_foo` is implemented in [M].
       firstFragment: <testLibraryFragment>::@class::C
       supertype: Object
@@ -13404,21 +12656,18 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int?
           firstFragment: <testLibraryFragment>::@mixin::M::@field::_foo
           getter: <none>
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::_foo
 ''');
   }
@@ -13483,24 +12732,20 @@
           fields
             promotable _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
         class B @54
           reference: <testLibraryFragment>::@class::B
           fields
             promotable _foo @71
               reference: <testLibraryFragment>::@class::B::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -13515,16 +12760,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -13535,16 +12777,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int?
           firstFragment: <testLibraryFragment>::@class::C::@field::_foo
           getter: <none>
@@ -13555,11 +12794,9 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::_foo
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       documentationComment: /// `_foo` is implemented in [B].
       firstFragment: <testLibraryFragment>::@class::D
       supertype: B
@@ -13630,17 +12867,14 @@
           fields
             _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -13655,16 +12889,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -13675,11 +12906,9 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
     class alias E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       documentationComment: /// Implicitly implements `_foo` as a getter that forwards to [noSuchMethod].
       firstFragment: <testLibraryFragment>::@class::E
       supertype: Object
@@ -13690,7 +12919,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -13770,24 +12998,20 @@
           fields
             _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
         class B @54
           reference: <testLibraryFragment>::@class::B
           fields
             _foo @71
               reference: <testLibraryFragment>::@class::B::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -13802,16 +13026,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -13822,25 +13043,21 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       documentationComment: /// Implicitly implements `_foo` as a getter that forwards to [noSuchMethod].
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -13851,11 +13068,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
       methods
         noSuchMethod
@@ -13921,17 +13136,14 @@
           fields
             _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -13946,16 +13158,13 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int?
           firstFragment: <testLibraryFragment>::@class::B::@field::_foo
           getter: <none>
@@ -13966,11 +13175,9 @@
       getters
         abstract get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_foo
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /// Implicitly implements `_foo` as a getter that forwards to [noSuchMethod].
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -14055,17 +13262,14 @@
           fields
             promotable _foo @41
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -14080,11 +13284,9 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /// Has a noSuchMethod thrower for B._field, but since private names in\n/// different libraries are distinct, this has no effect on promotion of\n/// C._field.
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -14151,17 +13353,14 @@
           fields
             _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -14176,11 +13375,9 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -14198,7 +13395,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::A
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /// Implicitly implements `_foo` as a getter that forwards to [noSuchMethod].
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -14286,7 +13482,6 @@
           fields
             _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
       mixins
         mixin M @54
@@ -14294,17 +13489,14 @@
           fields
             _foo @71
               reference: <testLibraryFragment>::@mixin::M::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -14319,11 +13511,9 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: Object
       constructors
@@ -14332,7 +13522,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /// Implicitly implements `_foo` as a getter that forwards to [noSuchMethod].
       firstFragment: <testLibraryFragment>::@class::C
       constructors
@@ -14350,21 +13539,18 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int?
           firstFragment: <testLibraryFragment>::@mixin::M::@field::_foo
           getter: <none>
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::_foo
   fieldNameNonPromotabilityInfo
     _foo
@@ -14419,17 +13605,14 @@
           fields
             promotable _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -14444,12 +13627,10 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -14503,18 +13684,15 @@
           fields
             _foo @17
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
               setter2: <testLibraryFragment>::@class::A::@setter::_foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
@@ -14526,12 +13704,10 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
       setters
         synthetic set _foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional __foo
               reference: <none>
@@ -14579,18 +13755,15 @@
           fields
             field @17
               reference: <testLibraryFragment>::@class::A::@field::field
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::field
               setter2: <testLibraryFragment>::@class::A::@setter::field
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         field
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::field
           getter: <none>
@@ -14602,12 +13775,10 @@
       getters
         synthetic get field
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::field
       setters
         synthetic set field=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _field
               reference: <none>
@@ -14659,27 +13830,22 @@
           fields
             promotable _foo @23
               reference: <testLibraryFragment>::@class::A::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::_foo
             bar @37
               reference: <testLibraryFragment>::@class::A::@field::bar
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::bar
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int?
           firstFragment: <testLibraryFragment>::@class::A::@field::_foo
           getter: <none>
         final bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::bar
           getter: <none>
@@ -14694,11 +13860,9 @@
       getters
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::_foo
         synthetic get bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::bar
 ''');
   }
@@ -14749,25 +13913,20 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static const x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -14778,7 +13937,6 @@
       getters
         synthetic static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -14837,25 +13995,20 @@
           fields
             b @35
               reference: <testLibraryFragment>::@class::C::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::b
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get b @-1
               reference: <testLibraryFragment>::@class::C::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: double
           firstFragment: <testLibraryFragment>::@class::C::@field::b
           getter: <none>
@@ -14866,7 +14019,6 @@
       getters
         synthetic get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::b
 ''');
   }
@@ -14942,36 +14094,29 @@
           fields
             b @46
               reference: <testLibraryFragment>::@class::C::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::b
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get b @-1
               reference: <testLibraryFragment>::@class::C::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::C
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       topLevelVariables
         final a @19
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::a
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::a
       getters
         get a @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::a
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: double
           firstFragment: <testLibraryFragment>::@class::C::@field::b
           getter: <none>
@@ -14982,19 +14127,16 @@
       getters
         synthetic get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::b
   topLevelVariables
     final a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::a
 ''');
   }
@@ -15041,25 +14183,20 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -15070,7 +14207,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -15117,25 +14253,20 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -15146,7 +14277,6 @@
       getters
         synthetic static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -15196,32 +14326,26 @@
           fields
             i @21
               reference: <testLibraryFragment>::@class::C::@field::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::i
               setter2: <testLibraryFragment>::@class::C::@setter::i
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get i @-1
               reference: <testLibraryFragment>::@class::C::@getter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set i= @-1
               reference: <testLibraryFragment>::@class::C::@setter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _i @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::i
           getter: <none>
@@ -15233,12 +14357,10 @@
       getters
         synthetic static get i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::i
       setters
         synthetic static set i=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _i
               reference: <none>
@@ -15291,25 +14413,20 @@
           fields
             f @25
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
           constructors
             const new @40
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -15320,7 +14437,6 @@
       getters
         synthetic static get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
 ''');
   }
@@ -15364,25 +14480,20 @@
           fields
             x @23
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -15393,7 +14504,6 @@
       getters
         synthetic static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -15443,32 +14553,26 @@
           fields
             i @26
               reference: <testLibraryFragment>::@class::C::@field::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::i
               setter2: <testLibraryFragment>::@class::C::@setter::i
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get i @-1
               reference: <testLibraryFragment>::@class::C::@getter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set i= @-1
               reference: <testLibraryFragment>::@class::C::@setter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _i @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static late i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::i
           getter: <none>
@@ -15480,12 +14584,10 @@
       getters
         synthetic static get i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::i
       setters
         synthetic static set i=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _i
               reference: <none>
@@ -15545,32 +14647,26 @@
           fields
             a @16
               reference: <testLibraryFragment>::@class::C::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::a
               setter2: <testLibraryFragment>::@class::C::@setter::a
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::C::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set a= @-1
               reference: <testLibraryFragment>::@class::C::@setter::a
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _a @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::a
           getter: <none>
@@ -15582,12 +14678,10 @@
       getters
         synthetic get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::a
       setters
         synthetic set a=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _a
               reference: <none>
@@ -15647,32 +14741,26 @@
           fields
             foo @16
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo
               setter2: <testLibraryFragment>::@class::C::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::C::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::C::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _foo @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
@@ -15684,12 +14772,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _foo
               reference: <none>
@@ -15765,41 +14851,33 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @29
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @43
           reference: <testLibraryFragment>::@class::B
           fields
             foo @65
               reference: <testLibraryFragment>::@class::B::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::B::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -15810,17 +14888,14 @@
       getters
         abstract get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::foo
           getter: <none>
@@ -15832,7 +14907,6 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::foo
 ''');
   }
@@ -15888,32 +14962,26 @@
           fields
             a @16
               reference: <testLibraryFragment>::@class::C::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::a
               setter2: <testLibraryFragment>::@class::C::@setter::a
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::C::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set a= @-1
               reference: <testLibraryFragment>::@class::C::@setter::a
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _a @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: Never
           firstFragment: <testLibraryFragment>::@class::C::@field::a
           getter: <none>
@@ -15925,12 +14993,10 @@
       getters
         synthetic get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::a
       setters
         synthetic set a=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _a
               reference: <none>
@@ -15985,32 +15051,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -16022,12 +15082,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -16082,32 +15140,26 @@
           fields
             x @14
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -16119,12 +15171,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -16193,52 +15243,42 @@
           fields
             i @14
               reference: <testLibraryFragment>::@class::C::@field::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::i
               setter2: <testLibraryFragment>::@class::C::@setter::i
             j @21
               reference: <testLibraryFragment>::@class::C::@field::j
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::j
               setter2: <testLibraryFragment>::@class::C::@setter::j
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get i @-1
               reference: <testLibraryFragment>::@class::C::@getter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
             get j @-1
               reference: <testLibraryFragment>::@class::C::@getter::j
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set i= @-1
               reference: <testLibraryFragment>::@class::C::@setter::i
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _i @-1
             set j= @-1
               reference: <testLibraryFragment>::@class::C::@setter::j
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _j @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::i
           getter: <none>
           setter: <none>
         j
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::j
           getter: <none>
@@ -16250,16 +15290,13 @@
       getters
         synthetic get i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::i
         synthetic get j
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::j
       setters
         synthetic set i=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _i
               reference: <none>
@@ -16267,7 +15304,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::i
         synthetic set j=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _j
               reference: <none>
@@ -16325,32 +15361,26 @@
           fields
             foo @21
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo
               setter2: <testLibraryFragment>::@class::C::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::C::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::C::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _foo @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         late foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
@@ -16362,12 +15392,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _foo
               reference: <none>
@@ -16425,32 +15453,26 @@
           fields
             foo @27
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo
               setter2: <testLibraryFragment>::@class::C::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::C::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::C::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _foo @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         late final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
@@ -16462,12 +15484,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _foo
               reference: <none>
@@ -16519,25 +15539,20 @@
           fields
             foo @27
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::C::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         late final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
@@ -16548,7 +15563,6 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo
 ''');
   }
@@ -16621,38 +15635,31 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @16
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @37
           reference: <testLibraryFragment>::@class::B
           fields
             f @62
               reference: <testLibraryFragment>::@class::B::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::f
               setter2: <testLibraryFragment>::@class::B::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::B::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::B::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _f @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -16664,13 +15671,11 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       fields
         late f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::f
           getter: <none>
@@ -16683,12 +15688,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _f
               reference: <none>
@@ -16770,48 +15773,39 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @20
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @39
           reference: <testLibraryFragment>::@class::B
           fields
             f @64
               reference: <testLibraryFragment>::@class::B::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::f
               setter2: <testLibraryFragment>::@class::B::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::B::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::B::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _f @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -16822,17 +15816,14 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       fields
         late f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::f
           getter: <none>
@@ -16845,12 +15836,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _f
               reference: <none>
@@ -16887,11 +15876,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     final class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -16938,25 +15925,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @27
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -16967,7 +15949,6 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -17010,25 +15991,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @27
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -17039,7 +16015,6 @@
       getters
         external get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -17082,25 +16057,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @14
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -17111,7 +16081,6 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -17160,25 +16129,20 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @20
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -17189,7 +16153,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -17238,25 +16201,20 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @20
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -17267,7 +16225,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -17316,25 +16273,20 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @20
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -17345,7 +16297,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -17392,25 +16343,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @20
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -17421,7 +16367,6 @@
       getters
         external get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -17464,25 +16409,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @25
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic static x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -17493,7 +16433,6 @@
       getters
         static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -17545,38 +16484,30 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
             y @-1
               reference: <testLibraryFragment>::@class::C::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::y
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @18
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
             get y @33
               reference: <testLibraryFragment>::@class::C::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::y
           getter: <none>
@@ -17587,11 +16518,9 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
         get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::y
 ''');
   }
@@ -17646,32 +16575,26 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @20
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @39
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @45
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -17683,12 +16606,10 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -17747,32 +16668,26 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @47
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @21
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @27
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -17784,12 +16699,10 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -17826,11 +16739,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     interface class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -17888,23 +16799,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @33
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @44
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -17912,7 +16819,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -17920,7 +16826,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -17992,42 +16897,34 @@
           fields
             it @32
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
   extensionTypes
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
 ''');
   }
@@ -18081,23 +16978,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @17
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @28
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -18105,7 +16998,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -18113,7 +17005,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -18168,23 +17059,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class X @36
           reference: <testLibraryFragment>::@class::X
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
         class Z @47
           reference: <testLibraryFragment>::@class::Z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::Z::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::Z
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -18192,7 +17079,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       constructors
         synthetic new
@@ -18200,7 +17086,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@constructor::new
     class Z
       reference: <testLibraryFragment>::@class::Z
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::Z
       constructors
         synthetic new
@@ -18242,15 +17127,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @19
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -18311,15 +17193,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @40 async
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -18380,15 +17259,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @40 async*
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -18441,16 +17317,13 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @34
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /**\n   * Docs\n   */
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -18497,15 +17370,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @19
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -18594,12 +17464,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::D::@constructor::new
           methods
             f @25
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @27
         class D @54
@@ -18607,17 +17475,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           methods
             f @63
               reference: <testLibraryFragment>::@class::D::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::D
               parameters
                 value @69
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       constructors
@@ -18635,7 +17500,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@method::f
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -18706,26 +17570,21 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::D::@constructor::new
           methods
             f @22
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @52
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           methods
             f @62
               reference: <testLibraryFragment>::@class::D::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       constructors
@@ -18739,7 +17598,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@method::f
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -18791,15 +17649,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @17 invokesSuperSelf
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -18859,22 +17714,18 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @17
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             A @38
               reference: <testLibraryFragment>::@class::B::@method::A
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -18882,7 +17733,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -18934,15 +17784,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @16
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -18993,18 +17840,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @10
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 x @12
                 y @15
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -19057,15 +17901,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @17
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -19117,15 +17958,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @26 sync*
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -19179,11 +18017,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @12
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               typeParameters
                 T @14
                 U @17
@@ -19192,7 +18028,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -19269,11 +18104,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @20
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               typeParameters
                 V @22
                 W @25
@@ -19284,7 +18117,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -19357,11 +18189,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @15
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               typeParameters
                 T @17
                 U @20
@@ -19370,7 +18200,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -19431,18 +18260,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @10
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
             g @17
               reference: <testLibraryFragment>::@class::C::@method::g
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -19486,11 +18311,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     mixin class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -19567,36 +18390,30 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::D::@constructor::new
         class D @40
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @51
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
         class F @62
           reference: <testLibraryFragment>::@class::F
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::F::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::F
         class G @73
           reference: <testLibraryFragment>::@class::G
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::G::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::G
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       constructors
@@ -19606,7 +18423,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -19614,7 +18430,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -19622,7 +18437,6 @@
           firstFragment: <testLibraryFragment>::@class::E::@constructor::new
     class F
       reference: <testLibraryFragment>::@class::F
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::F
       constructors
         synthetic new
@@ -19630,7 +18444,6 @@
           firstFragment: <testLibraryFragment>::@class::F::@constructor::new
     class G
       reference: <testLibraryFragment>::@class::G
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::G
       constructors
         synthetic new
@@ -19704,12 +18517,10 @@
           fields
             it @32
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
       mixins
         mixin A @6
           reference: <testLibraryFragment>::@mixin::A
@@ -19718,37 +18529,31 @@
   classes
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       supertype: Object
   extensionTypes
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
     mixin C
       reference: <testLibraryFragment>::@mixin::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::C
       superclassConstraints
         Object
@@ -19820,14 +18625,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::Z::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::Z
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
         class A @50
           reference: <testLibraryFragment>::@class::A
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @61
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -19835,7 +18638,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @76
           reference: <testLibraryFragment>::@class::C
           typeParameters
@@ -19843,11 +18645,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class Z
       reference: <testLibraryFragment>::@class::Z
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::Z
       supertype: A
       constructors
@@ -19857,7 +18657,6 @@
           firstFragment: <testLibraryFragment>::@class::Z::@constructor::new
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -19865,7 +18664,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         B1
       firstFragment: <testLibraryFragment>::@class::B
@@ -19875,7 +18673,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         C1
       firstFragment: <testLibraryFragment>::@class::C
@@ -19929,7 +18726,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       mixins
         mixin M @6
           reference: <testLibraryFragment>::@mixin::M
@@ -19938,7 +18734,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       supertype: Object
       constructors
@@ -19948,7 +18743,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::M
@@ -20009,7 +18803,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       mixins
         mixin M1 @6
           reference: <testLibraryFragment>::@mixin::M1
@@ -20018,7 +18811,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -20030,13 +18822,11 @@
   mixins
     mixin M1
       reference: <testLibraryFragment>::@mixin::M1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M1
       superclassConstraints
         Object
     mixin M2
       reference: <testLibraryFragment>::@mixin::M2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M2
       superclassConstraints
         Object
@@ -20090,23 +18880,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class X @45
           reference: <testLibraryFragment>::@class::X
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
         class Z @56
           reference: <testLibraryFragment>::@class::Z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::Z::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::Z
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: Object
       constructors
@@ -20115,7 +18901,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       constructors
         synthetic new
@@ -20123,7 +18908,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@constructor::new
     class Z
       reference: <testLibraryFragment>::@class::Z
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::Z
       constructors
         synthetic new
@@ -20173,11 +18957,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: dynamic
@@ -20237,11 +19019,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: dynamic
@@ -20291,11 +19071,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<dynamic>
@@ -20355,7 +19133,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @30
           reference: <testLibraryFragment>::@class::D
           typeParameters
@@ -20363,11 +19140,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: D<dynamic>
@@ -20378,7 +19153,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<dynamic>
@@ -20512,7 +19286,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @30
           reference: <testLibraryFragment>::@class::D
           typeParameters
@@ -20520,11 +19293,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: D<dynamic>
@@ -20535,7 +19306,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: D<dynamic>
@@ -20594,7 +19364,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @33
           reference: <testLibraryFragment>::@class::D
           typeParameters
@@ -20602,11 +19371,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: D<T>
@@ -20617,7 +19384,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::D
@@ -20678,7 +19444,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @39
           reference: <testLibraryFragment>::@class::D
           typeParameters
@@ -20686,11 +19451,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: D<dynamic>
@@ -20701,7 +19464,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: D<T>
@@ -20749,11 +19511,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: void Function(T)
@@ -20801,11 +19561,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: T Function()
@@ -20853,11 +19611,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: void Function()
@@ -20927,11 +19683,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: dynamic
@@ -20979,11 +19733,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<dynamic>
@@ -21027,11 +19779,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21087,7 +19837,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @30
           reference: <testLibraryFragment>::@class::D
           typeParameters
@@ -21095,11 +19844,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: D<dynamic>
@@ -21110,7 +19857,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::D
@@ -21158,11 +19904,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -21210,17 +19954,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             + @20
               reference: <testLibraryFragment>::@class::C::@method::+
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 other @24
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21277,17 +20018,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             == @25
               reference: <testLibraryFragment>::@class::C::@method::==
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 other @35
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21341,17 +20079,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             + @29
               reference: <testLibraryFragment>::@class::C::@method::+
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 other @33
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21408,17 +20143,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             >= @25
               reference: <testLibraryFragment>::@class::C::@method::>=
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 other @30
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21472,17 +20204,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             [] @23
               reference: <testLibraryFragment>::@class::C::@method::[]
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 i @30
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21541,18 +20270,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             []= @25
               reference: <testLibraryFragment>::@class::C::@method::[]=
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 i @33
                 v @41
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21612,17 +20338,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             <= @25
               reference: <testLibraryFragment>::@class::C::@method::<=
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 other @30
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21687,27 +20410,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @13
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21716,7 +20434,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -21724,12 +20441,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -21786,27 +20501,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @14
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21815,7 +20525,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C?
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -21823,12 +20532,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -21865,11 +20572,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract sealed class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21917,18 +20622,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @29
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     base class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -21936,7 +20638,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     abstract sealed base class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -21986,17 +20687,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @29
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     base class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -22004,7 +20702,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     abstract sealed base class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -22052,17 +20749,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @30
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     final class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -22070,7 +20764,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     abstract sealed base class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -22118,18 +20811,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @30
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     final class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -22137,7 +20827,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     abstract sealed final class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -22196,13 +20885,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @50
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::B::@constructor::new
       mixins
         mixin A @11
@@ -22210,7 +20897,6 @@
   classes
     interface class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -22218,7 +20904,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     abstract sealed final class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: B
       constructors
@@ -22229,7 +20914,6 @@
   mixins
     base mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -22275,18 +20959,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @34
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
   classes
     interface class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -22294,7 +20975,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     abstract sealed interface class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -22344,17 +21024,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @34
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     interface class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -22362,7 +21039,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     abstract sealed class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -22413,27 +21089,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @28
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @34
   classes
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -22444,7 +21115,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -22495,27 +21165,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @19
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @35
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -22526,7 +21191,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional covariant value
               reference: <none>
@@ -22577,27 +21241,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @28
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @34
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -22608,7 +21267,6 @@
       setters
         external set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -22658,27 +21316,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @19
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @21
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -22689,7 +21342,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -22739,27 +21391,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @14
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @20
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -22770,7 +21417,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -22895,21 +21541,17 @@
           fields
             t @16
               reference: <testLibraryFragment>::@class::A::@field::t
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::t
               setter2: <testLibraryFragment>::@class::A::@setter::t
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get t @-1
               reference: <testLibraryFragment>::@class::A::@getter::t
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set t= @-1
               reference: <testLibraryFragment>::@class::A::@setter::t
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _t @-1
         class B @27
@@ -22917,22 +21559,18 @@
           fields
             t @50
               reference: <testLibraryFragment>::@class::B::@field::t
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::t
               setter2: <testLibraryFragment>::@class::B::@setter::t
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           getters
             get t @-1
               reference: <testLibraryFragment>::@class::B::@getter::t
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set t= @-1
               reference: <testLibraryFragment>::@class::B::@setter::t
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _t @-1
         class C @61
@@ -22940,35 +21578,29 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
         class D @96
           reference: <testLibraryFragment>::@class::D
           fields
             t @-1
               reference: <testLibraryFragment>::@class::D::@field::t
-              enclosingFragment: <testLibraryFragment>::@class::D
               setter2: <testLibraryFragment>::@class::D::@setter::t
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
               superConstructor: <testLibraryFragment>::@class::C::@constructor::new
           setters
             set t= @121
               reference: <testLibraryFragment>::@class::D::@setter::t
-              enclosingFragment: <testLibraryFragment>::@class::D
               parameters
                 p @123
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::t
           getter: <none>
@@ -22980,12 +21612,10 @@
       getters
         synthetic get t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::t
       setters
         synthetic set t=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _t
               reference: <none>
@@ -22993,13 +21623,11 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::t
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       fields
         t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: double
           firstFragment: <testLibraryFragment>::@class::B::@field::t
           getter: <none>
@@ -23012,12 +21640,10 @@
       getters
         synthetic get t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::t
       setters
         synthetic set t=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _t
               reference: <none>
@@ -23025,7 +21651,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::t
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A
       constructors
@@ -23035,13 +21660,11 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       supertype: C
       fields
         synthetic t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::D::@field::t
           setter: <none>
@@ -23053,7 +21676,6 @@
       setters
         set t=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           parameters
             requiredPositional p
               reference: <none>
@@ -23127,17 +21749,14 @@
           fields
             f @-1
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::D::@constructor::new
           setters
             set f= @29
               reference: <testLibraryFragment>::@class::C::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @31
         class D @58
@@ -23145,28 +21764,23 @@
           fields
             f @-1
               reference: <testLibraryFragment>::@class::D::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::D
               setter2: <testLibraryFragment>::@class::D::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           setters
             set f= @71
               reference: <testLibraryFragment>::@class::D::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::D
               parameters
                 value @77
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       fields
         synthetic f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           setter: <none>
@@ -23178,7 +21792,6 @@
       setters
         set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -23186,12 +21799,10 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::f
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       fields
         synthetic f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: int
           firstFragment: <testLibraryFragment>::@class::D::@field::f
           setter: <none>
@@ -23202,7 +21813,6 @@
       setters
         abstract set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           parameters
             requiredPositional value
               reference: <none>
@@ -23256,27 +21866,22 @@
           fields
             f @-1
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set f= @23
               reference: <testLibraryFragment>::@class::C::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @29
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic static f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           setter: <none>
@@ -23287,7 +21892,6 @@
       setters
         static set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -23338,28 +21942,23 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @19
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 default a @22
                   reference: <testLibraryFragment>::@class::C::@setter::x::@parameter::a
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -23370,7 +21969,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             optionalNamed a
               reference: <none>
@@ -23417,25 +22015,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @19
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -23446,7 +22039,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@setter::x
 ''');
   }
@@ -23492,27 +22084,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @19
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 default a @22
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -23523,7 +22110,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             optionalPositional a
               reference: <none>
@@ -23575,28 +22161,23 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @19
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @21
                 b @24
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -23607,7 +22188,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional a
               reference: <none>
@@ -23666,27 +22246,22 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @16
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @24
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           setter: <none>
@@ -23697,7 +22272,6 @@
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -23753,27 +22327,22 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @16
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @24
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           setter: <none>
@@ -23784,7 +22353,6 @@
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -23838,27 +22406,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @21
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @27
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -23869,7 +22432,6 @@
       setters
         external set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -23920,27 +22482,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @26
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @32
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic static x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -23951,7 +22508,6 @@
       setters
         static set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -24017,42 +22573,34 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
             y @-1
               reference: <testLibraryFragment>::@class::C::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::y
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @21
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @27
             set y= @43
               reference: <testLibraryFragment>::@class::C::@setter::y
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @45
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::y
           setter: <none>
@@ -24063,7 +22611,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -24071,7 +22618,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::x
         set y=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -24114,11 +22660,9 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
 ''');
@@ -24154,11 +22698,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -24215,34 +22757,28 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -24294,7 +22830,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::D::@constructor::new
                 substitution: {T1: int, T2: double}
@@ -24306,11 +22841,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D<int, double>
       constructors
@@ -24320,7 +22853,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
         T2
@@ -24371,13 +22903,11 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A<dynamic>
 ''');
@@ -24430,20 +22960,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @20
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: B}
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -24453,7 +22980,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A<B>
       constructors
@@ -24499,11 +23025,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -24542,11 +23066,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -24591,11 +23113,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -24655,17 +23175,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @48
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: Object
@@ -24678,7 +23195,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -24721,11 +23237,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: dynamic
@@ -24780,11 +23294,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: dynamic
@@ -24835,11 +23347,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: void Function(A<dynamic>)
@@ -24887,11 +23397,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: void Function<U extends C<dynamic>>()
@@ -24959,11 +23467,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: void Function(X)
@@ -25031,11 +23537,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: X Function()
@@ -25106,11 +23610,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: X Function(X)
@@ -25181,11 +23683,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: X Function(X)
@@ -25236,11 +23736,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: X Function(X)
@@ -25288,11 +23786,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: void Function(X)
@@ -25340,11 +23836,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: X Function()
@@ -25392,11 +23886,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: X Function()
@@ -25459,11 +23951,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: List<void Function(X)>
@@ -25529,11 +24019,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: Map<X, int>
@@ -25585,11 +24073,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: List<U>
@@ -25639,11 +24125,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: U
@@ -25689,11 +24173,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -25737,11 +24219,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -25785,11 +24265,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -25839,11 +24317,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -25931,7 +24407,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -25945,29 +24420,24 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @43
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
         class F @54
           reference: <testLibraryFragment>::@class::F
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::F::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::F
         class G @65
           reference: <testLibraryFragment>::@class::G
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::G::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::G
   classes
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       constructors
@@ -25977,7 +24447,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -25985,7 +24454,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -25993,7 +24461,6 @@
           firstFragment: <testLibraryFragment>::@class::E::@constructor::new
     class F
       reference: <testLibraryFragment>::@class::F
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::F
       constructors
         synthetic new
@@ -26001,7 +24468,6 @@
           firstFragment: <testLibraryFragment>::@class::F::@constructor::new
     class G
       reference: <testLibraryFragment>::@class::G
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::G
       constructors
         synthetic new
@@ -26067,7 +24533,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -26081,17 +24546,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @46
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     abstract class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       constructors
@@ -26101,7 +24563,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -26109,7 +24570,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -26165,7 +24625,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -26179,7 +24638,6 @@
   classes
     base class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: Object
       constructors
@@ -26189,7 +24647,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -26253,19 +24710,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class M @23
           reference: <testLibraryFragment>::@class::M
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::M::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::M
         class X @34
           reference: <testLibraryFragment>::@class::X
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -26277,7 +24731,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -26285,7 +24738,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     mixin class M
       reference: <testLibraryFragment>::@class::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::M
       constructors
         synthetic new
@@ -26293,7 +24745,6 @@
           firstFragment: <testLibraryFragment>::@class::M::@constructor::new
     class alias X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       supertype: A
       constructors
@@ -26410,25 +24861,21 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class M1 @36
           reference: <testLibraryFragment>::@class::M1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::M1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::M1
         class M2 @54
           reference: <testLibraryFragment>::@class::M2
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::M2::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::M2
         class C2 @67
           reference: <testLibraryFragment>::@class::C2
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C2::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C2
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -26447,7 +24894,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C1
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -26464,7 +24910,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -26476,7 +24921,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     mixin class M1
       reference: <testLibraryFragment>::@class::M1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::M1
       constructors
         synthetic new
@@ -26484,7 +24928,6 @@
           firstFragment: <testLibraryFragment>::@class::M1::@constructor::new
     mixin class M2
       reference: <testLibraryFragment>::@class::M2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::M2
       constructors
         synthetic new
@@ -26492,7 +24935,6 @@
           firstFragment: <testLibraryFragment>::@class::M2::@constructor::new
     class alias C2
       reference: <testLibraryFragment>::@class::C2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C2
       supertype: C1
       constructors
@@ -26506,7 +24948,6 @@
           firstFragment: <testLibraryFragment>::@class::C2::@constructor::new
     class alias C1
       reference: <testLibraryFragment>::@class::C1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C1
       supertype: A
       constructors
@@ -26718,17 +25159,14 @@
           constructors
             c1 @14
               reference: <testLibraryFragment>::@class::A::@constructor::c1
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 13
               nameEnd: 16
             c2 @29
               reference: <testLibraryFragment>::@class::A::@constructor::c2
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 28
               nameEnd: 31
             c3 @65
               reference: <testLibraryFragment>::@class::A::@constructor::c3
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 64
               nameEnd: 67
         class C @118
@@ -26736,7 +25174,6 @@
           constructors
             synthetic c1 @-1
               reference: <testLibraryFragment>::@class::C::@constructor::c1
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -26757,7 +25194,6 @@
               superConstructor: <testLibraryFragment>::@class::A::@constructor::c1
             synthetic c2 @-1
               reference: <testLibraryFragment>::@class::C::@constructor::c2
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -26786,7 +25222,6 @@
               superConstructor: <testLibraryFragment>::@class::A::@constructor::c2
             synthetic c3 @-1
               reference: <testLibraryFragment>::@class::C::@constructor::c3
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -26819,7 +25254,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         c1
@@ -26857,7 +25291,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::c3
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A
       constructors
@@ -26900,7 +25333,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -26998,7 +25430,6 @@
           constructors
             new @27
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @61
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -27006,7 +25437,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -27032,7 +25462,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: num
@@ -27050,7 +25479,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class alias B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         E
           bound: num
@@ -27071,7 +25499,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -27140,7 +25567,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -27154,17 +25580,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @54
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /**\n * Docs\n */
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
@@ -27175,7 +25598,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -27183,7 +25605,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -27254,7 +25675,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -27268,17 +25688,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @59
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /// aaa\n/// b\n/// cc
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
@@ -27289,7 +25706,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -27297,7 +25713,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -27368,7 +25783,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -27382,17 +25796,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @98
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       documentationComment: /**\n * Docs\n */
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
@@ -27403,7 +25814,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -27411,7 +25821,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -27467,7 +25876,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -27481,7 +25889,6 @@
   classes
     final class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: Object
       constructors
@@ -27491,7 +25898,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -27570,7 +25976,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::Z::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::Z
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -27584,7 +25989,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @53
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -27592,7 +25996,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @68
           reference: <testLibraryFragment>::@class::C
           typeParameters
@@ -27600,11 +26003,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class alias Z
       reference: <testLibraryFragment>::@class::Z
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::Z
       supertype: A
       constructors
@@ -27614,7 +26015,6 @@
           firstFragment: <testLibraryFragment>::@class::Z::@constructor::new
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -27622,7 +26022,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         B1
       firstFragment: <testLibraryFragment>::@class::B
@@ -27632,7 +26031,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         C1
       firstFragment: <testLibraryFragment>::@class::C
@@ -27690,7 +26088,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -27704,7 +26101,6 @@
   classes
     interface class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: Object
       constructors
@@ -27714,7 +26110,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -27777,7 +26172,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -27788,7 +26182,6 @@
   classes
     class alias A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       supertype: Object
       constructors
@@ -27851,7 +26244,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -27867,7 +26259,6 @@
   classes
     class alias A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       supertype: Object
       constructors
@@ -27877,13 +26268,11 @@
   mixins
     mixin M1
       reference: <testLibraryFragment>::@mixin::M1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M1
       superclassConstraints
         Object
     mixin M2
       reference: <testLibraryFragment>::@mixin::M2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M2
       superclassConstraints
         Object
@@ -27937,7 +26326,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -27951,7 +26339,6 @@
   classes
     mixin class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: Object
       constructors
@@ -27961,7 +26348,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -28031,7 +26417,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28045,17 +26430,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @50
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<dynamic>
@@ -28068,7 +26450,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -28076,7 +26457,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -28149,7 +26529,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28163,17 +26542,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @40
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -28185,7 +26561,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -28193,7 +26568,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -28261,7 +26635,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28275,17 +26648,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @37
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       constructors
@@ -28295,7 +26665,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -28303,7 +26672,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -28359,7 +26727,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28373,7 +26740,6 @@
   classes
     abstract sealed class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: Object
       constructors
@@ -28383,7 +26749,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -28473,13 +26838,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::M::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::M
         class MixinApp @34
           reference: <testLibraryFragment>::@class::MixinApp
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28490,7 +26853,6 @@
               superConstructor: package:test/a.dart::<fragment>::@class::Base::@constructor::new
             synthetic const named @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28507,7 +26869,6 @@
   classes
     class M
       reference: <testLibraryFragment>::@class::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::M
       constructors
         synthetic new
@@ -28515,7 +26876,6 @@
           firstFragment: <testLibraryFragment>::@class::M::@constructor::new
     class alias MixinApp
       reference: <testLibraryFragment>::@class::MixinApp
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::MixinApp
       supertype: Base
       constructors
@@ -28759,13 +27119,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::M::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::M
         class MixinApp @34
           reference: <testLibraryFragment>::@class::MixinApp
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28776,7 +27134,6 @@
               superConstructor: package:test/a.dart::<fragment>::@class::Base::@constructor::new
             synthetic noArgs @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::noArgs
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28792,7 +27149,6 @@
               superConstructor: package:test/a.dart::<fragment>::@class::Base::@constructor::noArgs
             synthetic requiredArg @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::requiredArg
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28813,7 +27169,6 @@
               superConstructor: package:test/a.dart::<fragment>::@class::Base::@constructor::requiredArg
             synthetic positionalArg @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::positionalArg
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28834,7 +27189,6 @@
               superConstructor: package:test/a.dart::<fragment>::@class::Base::@constructor::positionalArg
             synthetic positionalArg2 @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::positionalArg2
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28855,7 +27209,6 @@
               superConstructor: package:test/a.dart::<fragment>::@class::Base::@constructor::positionalArg2
             synthetic namedArg @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::namedArg
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28876,7 +27229,6 @@
               superConstructor: package:test/a.dart::<fragment>::@class::Base::@constructor::namedArg
             synthetic namedArg2 @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::namedArg2
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -28898,7 +27250,6 @@
   classes
     class M
       reference: <testLibraryFragment>::@class::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::M
       constructors
         synthetic new
@@ -28906,7 +27257,6 @@
           firstFragment: <testLibraryFragment>::@class::M::@constructor::new
     class alias MixinApp
       reference: <testLibraryFragment>::@class::MixinApp
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::MixinApp
       supertype: Base
       constructors
@@ -29053,7 +27403,6 @@
           constructors
             ctor @23
               reference: <testLibraryFragment>::@class::Base::@constructor::ctor
-              enclosingFragment: <testLibraryFragment>::@class::Base
               periodOffset: 22
               nameEnd: 27
         class M @53
@@ -29061,13 +27410,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::M::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::M
         class MixinApp @64
           reference: <testLibraryFragment>::@class::MixinApp
           constructors
             synthetic ctor @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::ctor
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -29095,7 +27442,6 @@
   classes
     class Base
       reference: <testLibraryFragment>::@class::Base
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::Base
@@ -29112,7 +27458,6 @@
           firstFragment: <testLibraryFragment>::@class::Base::@constructor::ctor
     class M
       reference: <testLibraryFragment>::@class::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::M
       constructors
         synthetic new
@@ -29120,7 +27465,6 @@
           firstFragment: <testLibraryFragment>::@class::M::@constructor::new
     class alias MixinApp
       reference: <testLibraryFragment>::@class::MixinApp
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::MixinApp
       supertype: Base<dynamic>
       constructors
@@ -29233,7 +27577,6 @@
           constructors
             ctor @23
               reference: <testLibraryFragment>::@class::Base::@constructor::ctor
-              enclosingFragment: <testLibraryFragment>::@class::Base
               periodOffset: 22
               nameEnd: 27
         class M @53
@@ -29241,7 +27584,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::M::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::M
         class MixinApp @64
           reference: <testLibraryFragment>::@class::MixinApp
           typeParameters
@@ -29249,7 +27591,6 @@
           constructors
             synthetic ctor @-1
               reference: <testLibraryFragment>::@class::MixinApp::@constructor::ctor
-              enclosingFragment: <testLibraryFragment>::@class::MixinApp
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -29277,7 +27618,6 @@
   classes
     class Base
       reference: <testLibraryFragment>::@class::Base
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::Base
@@ -29294,7 +27634,6 @@
           firstFragment: <testLibraryFragment>::@class::Base::@constructor::ctor
     class M
       reference: <testLibraryFragment>::@class::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::M
       constructors
         synthetic new
@@ -29302,7 +27641,6 @@
           firstFragment: <testLibraryFragment>::@class::M::@constructor::new
     class alias MixinApp
       reference: <testLibraryFragment>::@class::MixinApp
-      enclosingElement2: <testLibrary>
       typeParameters
         U
       firstFragment: <testLibraryFragment>::@class::MixinApp
@@ -29424,7 +27762,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -29438,53 +27775,42 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @37
           reference: <testLibraryFragment>::@class::E
           fields
             x @105
               reference: <testLibraryFragment>::@class::E::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::E
               getter2: <testLibraryFragment>::@class::E::@getter::x
               setter2: <testLibraryFragment>::@class::E::@setter::x
             a @-1
               reference: <testLibraryFragment>::@class::E::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::E
               getter2: <testLibraryFragment>::@class::E::@getter::a
             b @-1
               reference: <testLibraryFragment>::@class::E::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::E
               setter2: <testLibraryFragment>::@class::E::@setter::b
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::E::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::E
             get a @51
               reference: <testLibraryFragment>::@class::E::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::E
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::E::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::E
               parameters
                 _x @-1
             set b= @73
               reference: <testLibraryFragment>::@class::E::@setter::b
-              enclosingFragment: <testLibraryFragment>::@class::E
               parameters
                 i @79
           methods
             f @92
               reference: <testLibraryFragment>::@class::E::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::E
   classes
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       constructors
@@ -29494,7 +27820,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -29502,25 +27827,21 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::E
           type: int
           firstFragment: <testLibraryFragment>::@class::E::@field::x
           getter: <none>
           setter: <none>
         synthetic a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::E
           type: int
           firstFragment: <testLibraryFragment>::@class::E::@field::a
           getter: <none>
         synthetic b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::E
           type: int
           firstFragment: <testLibraryFragment>::@class::E::@field::b
           setter: <none>
@@ -29531,16 +27852,13 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::E
           firstFragment: <testLibraryFragment>::@class::E::@getter::x
         get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::E
           firstFragment: <testLibraryFragment>::@class::E::@getter::a
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::E
           parameters
             requiredPositional _x
               reference: <none>
@@ -29548,7 +27866,6 @@
           firstFragment: <testLibraryFragment>::@class::E::@setter::x
         set b=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::E
           parameters
             requiredPositional i
               reference: <none>
@@ -29596,17 +27913,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @17
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -29614,7 +27928,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -29705,36 +28018,29 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             const named @38
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 37
               nameEnd: 43
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const x @61
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: Object
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -29749,19 +28055,16 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -29828,48 +28131,39 @@
           fields
             foo @16
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo
               setter2: <testLibraryFragment>::@class::C::@setter::foo
             bar @-1
               reference: <testLibraryFragment>::@class::C::@field::bar
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::bar
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::C::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::C::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _foo @-1
             set bar= @32
               reference: <testLibraryFragment>::@class::C::@setter::bar
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 this.foo @41
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
           setter: <none>
         synthetic bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::bar
           setter: <none>
@@ -29880,12 +28174,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _foo
               reference: <none>
@@ -29893,7 +28185,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::foo
         set bar=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional final foo
               reference: <none>
@@ -29948,27 +28239,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @16
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 this.x @23
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -29979,7 +28265,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional final x
               reference: <none>
@@ -30065,44 +28350,35 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @20
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @36
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         v @43
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -30117,14 +28393,12 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: void Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -30132,16 +28406,13 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -30149,7 +28420,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -30239,22 +28509,18 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
           methods
             foo @39
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
         class A @65
           reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
           previousFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
           methods
             bar @76
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
       constructors
         synthetic new
@@ -30352,7 +28618,6 @@
           constructors
             const new @33
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -30362,21 +28627,17 @@
           fields
             foo @58
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static const foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
           getter: <none>
@@ -30387,7 +28648,6 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
 ''');
   }
@@ -30472,7 +28732,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -30482,21 +28741,17 @@
           fields
             foo @58
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static const foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
           getter: <none>
@@ -30507,7 +28762,6 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
 ''');
   }
@@ -30594,7 +28848,6 @@
           constructors
             const new @33
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -30604,21 +28857,17 @@
           fields
             foo @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
           getter: <none>
@@ -30629,7 +28878,6 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
 ''');
   }
@@ -30710,7 +28958,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -30720,21 +28967,17 @@
           fields
             foo @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
           getter: <none>
@@ -30745,7 +28988,6 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
 ''');
   }
@@ -30917,7 +29159,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a1.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/a11.dart
@@ -30967,7 +29208,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -31074,33 +29314,27 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0
           methods
             foo1 @47
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0
         class A @66
           reference: <testLibrary>::@fragment::package:test/a.dart::@class::A
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
           methods
             foo2 @77
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::A::@method::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
         class A @104
           reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1
           previousFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
           methods
             foo3 @115
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1::@method::foo3
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0
       constructors
         synthetic new
@@ -31112,7 +29346,6 @@
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0::@method::foo1
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
       constructors
         synthetic new
@@ -31226,7 +29459,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -31237,11 +29469,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
           methods
             foo1 @61
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
@@ -31251,11 +29481,9 @@
           methods
             foo2 @43
               reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@method::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -31263,7 +29491,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
       constructors
         synthetic new
@@ -31368,17 +29595,14 @@
           fields
             foo @31
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -31390,18 +29614,15 @@
           constructors
             augment foo @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 50
               nameEnd: 54
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -31413,12 +29634,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -31507,12 +29726,10 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           getters
             get foo @35
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -31522,18 +29739,15 @@
           constructors
             augment foo @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 50
               nameEnd: 54
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -31544,7 +29758,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -31622,7 +29835,6 @@
           methods
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -31632,13 +29844,11 @@
           constructors
             augment foo @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 50
               nameEnd: 54
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         foo
@@ -31734,12 +29944,10 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           setters
             set foo= @31
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @39
     <testLibrary>::@fragment::package:test/a.dart
@@ -31751,18 +29959,15 @@
           constructors
             augment foo @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 50
               nameEnd: 54
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           setter: <none>
@@ -31773,7 +29978,6 @@
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -31851,13 +30055,11 @@
           constructors
             named @43
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 42
               nameEnd: 48
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         named
@@ -31950,13 +30152,11 @@
           constructors
             named @47
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 46
               nameEnd: 52
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@class::A
@@ -32041,7 +30241,6 @@
           constructors
             new @27
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -32051,13 +30250,11 @@
           constructors
             named @43
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 42
               nameEnd: 48
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -32136,11 +30333,9 @@
           constructors
             new @41
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -32219,7 +30414,6 @@
           constructors
             named @29
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 28
               nameEnd: 34
     <testLibrary>::@fragment::package:test/a.dart
@@ -32231,11 +30425,9 @@
           constructors
             new @41
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         named
@@ -32330,12 +30522,10 @@
           fields
             f @37
               reference: <testLibraryFragment>::@class::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::f
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -32345,18 +30535,15 @@
           constructors
             named @43
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 42
               nameEnd: 48
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::f
           getter: <none>
@@ -32371,7 +30558,6 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::f
 ''');
   }
@@ -32465,12 +30651,10 @@
           fields
             f @37
               reference: <testLibraryFragment>::@class::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::f
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -32480,7 +30664,6 @@
           constructors
             const named @49
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 48
               nameEnd: 54
               constantInitializers
@@ -32496,12 +30679,10 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::f
           getter: <none>
@@ -32512,7 +30693,6 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::f
 ''');
   }
@@ -32593,7 +30773,6 @@
           constructors
             foo @29
               reference: <testLibraryFragment>::@class::A::@constructor::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 28
               nameEnd: 32
     <testLibrary>::@fragment::package:test/a.dart
@@ -32605,16 +30784,13 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
       constructors
@@ -32727,22 +30903,18 @@
           fields
             foo @31
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -32754,17 +30926,14 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@field::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -32776,12 +30945,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -32925,22 +31092,18 @@
           fields
             foo @46
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -32954,7 +31117,6 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@field::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@fieldAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -32966,17 +31128,14 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -32988,12 +31147,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -33137,23 +31294,19 @@
           fields
             foo @46
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -33167,7 +31320,6 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@getter::foo
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
@@ -33178,17 +31330,14 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@field::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -33200,12 +31349,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -33352,22 +31499,18 @@
           fields
             foo @46
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setterAugmentation::foo
@@ -33382,7 +31525,6 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 _ @61
               previousFragment: <testLibraryFragment>::@class::A::@setter::foo
@@ -33395,17 +31537,14 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@field::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -33417,12 +31556,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -33530,17 +31667,14 @@
           fields
             foo @44
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -33550,17 +31684,14 @@
           fields
             foo @67
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@field::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static const foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -33571,7 +31702,6 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -33679,22 +31809,18 @@
           fields
             foo @31
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -33706,17 +31832,14 @@
           fields
             foo @56
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@field::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -33728,12 +31851,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -33846,17 +31967,14 @@
           fields
             foo @37
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             const new @54
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -33866,17 +31984,14 @@
           fields
             foo @59
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@field::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -33887,7 +32002,6 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -33985,17 +32099,14 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @35
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -34005,17 +32116,14 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@field::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -34026,7 +32134,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -34112,11 +32219,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -34126,16 +32231,13 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
       constructors
@@ -34245,17 +32347,14 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @31
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @39
     <testLibrary>::@fragment::package:test/a.dart
@@ -34267,17 +32366,14 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@field::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           setter: <none>
@@ -34288,7 +32384,6 @@
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -34419,21 +32514,17 @@
           fields
             foo1 @31
               reference: <testLibraryFragment>::@class::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo1
               setter2: <testLibraryFragment>::@class::A::@setter::foo1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo1 @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo1= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo1 @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -34445,35 +32536,29 @@
           fields
             foo2 @45
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
               setter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
           getters
             get foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
           setters
             set foo2= @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 _foo2 @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo1
           getter: <none>
           setter: <none>
         foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
           getter: <none>
@@ -34485,16 +32570,13 @@
       getters
         synthetic get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo1
         synthetic get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
       setters
         synthetic set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo1
               reference: <none>
@@ -34502,7 +32584,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::foo1
         synthetic set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo2
               reference: <none>
@@ -34645,21 +32726,17 @@
           fields
             foo1 @34
               reference: <testLibraryFragment>::@class::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo1
               setter2: <testLibraryFragment>::@class::A::@setter::foo1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo1 @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo1= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo1 @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -34673,37 +32750,31 @@
           fields
             foo2 @48
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
               setter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
           getters
             get foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
           setters
             set foo2= @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 _foo2 @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: T1
           firstFragment: <testLibraryFragment>::@class::A::@field::foo1
           getter: <none>
           setter: <none>
         foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: T2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
           getter: <none>
@@ -34715,16 +32786,13 @@
       getters
         synthetic get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo1
         synthetic get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
       setters
         synthetic set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo1
               reference: <none>
@@ -34732,7 +32800,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::foo1
         synthetic set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo2
               reference: <none>
@@ -34822,7 +32889,6 @@
           constructors
             new @27
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -34832,21 +32898,17 @@
           fields
             foo @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
           getter: <none>
@@ -34861,7 +32923,6 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
 ''');
   }
@@ -34953,7 +33014,6 @@
           constructors
             const new @33
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               constantInitializers
                 ConstructorFieldInitializer
                   fieldName: SimpleIdentifier
@@ -34973,21 +33033,17 @@
           fields
             foo @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
           getter: <none>
@@ -34998,7 +33054,6 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo
 ''');
   }
@@ -35079,7 +33134,6 @@
           constructors
             foo @29
               reference: <testLibraryFragment>::@class::A::@constructor::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 28
               nameEnd: 32
     <testLibrary>::@fragment::package:test/a.dart
@@ -35091,11 +33145,9 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         foo
@@ -35104,7 +33156,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
 ''');
   }
@@ -35190,11 +33241,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -35204,11 +33253,9 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -35217,7 +33264,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
       methods
         foo
@@ -35320,16 +33366,13 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @31
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @39
     <testLibrary>::@fragment::package:test/a.dart
@@ -35341,16 +33384,13 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           setter: <none>
@@ -35361,12 +33401,10 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -35473,16 +33511,13 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@class::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo1 @35
               reference: <testLibraryFragment>::@class::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -35492,27 +33527,22 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
           getters
             get foo2 @49
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
           getter: <none>
@@ -35523,11 +33553,9 @@
       getters
         get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo1
         get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
 ''');
   }
@@ -35642,16 +33670,13 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@class::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo1 @38
               reference: <testLibraryFragment>::@class::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -35663,29 +33688,24 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
           getters
             get foo2 @52
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: T1
           firstFragment: <testLibraryFragment>::@class::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: T2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
           getter: <none>
@@ -35696,11 +33716,9 @@
       getters
         abstract get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo1
         abstract get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
 ''');
   }
@@ -35808,22 +33826,18 @@
           fields
             foo @31
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -35835,17 +33849,14 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@getter::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -35857,12 +33868,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -36006,22 +34015,18 @@
           fields
             foo @46
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -36035,7 +34040,6 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -36047,17 +34051,14 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -36069,12 +34070,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -36189,24 +34188,19 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@class::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo1
             foo2 @-1
               reference: <testLibraryFragment>::@class::A::@field::foo2
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo2
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo1 @35
               reference: <testLibraryFragment>::@class::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo1
             get foo2 @56
               reference: <testLibraryFragment>::@class::A::@getter::foo2
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -36216,23 +34210,19 @@
           getters
             augment get foo1 @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@getter::foo1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo2
           getter: <none>
@@ -36243,11 +34233,9 @@
       getters
         get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo2
         get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo1
 ''');
   }
@@ -36352,16 +34340,13 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @35
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo::@def::0
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -36372,22 +34357,18 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo::@def::0
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo::@def::1
             augment get foo @85
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo::@def::1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo::@def::0
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -36398,7 +34379,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -36526,16 +34506,13 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @50
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -36548,7 +34525,6 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -36560,17 +34536,14 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -36581,7 +34554,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -36659,16 +34631,13 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getterAugmentation::foo
 ''');
   }
@@ -36755,13 +34724,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class I1 @46
           reference: <testLibraryFragment>::@class::I1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -36773,11 +34740,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -36785,7 +34750,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -36793,7 +34757,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       constructors
         synthetic new
@@ -36916,13 +34879,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class I1 @46
           reference: <testLibraryFragment>::@class::I1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -36936,7 +34897,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
@@ -36948,11 +34908,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/b.dart::@class::I3::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@class::I3
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -36960,7 +34918,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -36968,7 +34925,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       constructors
         synthetic new
@@ -36976,7 +34932,6 @@
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
     class I3
       reference: <testLibrary>::@fragment::package:test/b.dart::@class::I3
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@class::I3
       constructors
         synthetic new
@@ -37078,13 +35033,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class I1 @49
           reference: <testLibraryFragment>::@class::I1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -37100,11 +35053,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -37114,7 +35065,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -37122,7 +35072,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
@@ -37227,13 +35176,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class I1 @49
           reference: <testLibraryFragment>::@class::I1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -37250,11 +35197,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -37264,7 +35209,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -37272,7 +35216,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
@@ -37356,7 +35299,6 @@
           constructors
             foo @29
               reference: <testLibraryFragment>::@class::A::@constructor::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 28
               nameEnd: 32
     <testLibrary>::@fragment::package:test/a.dart
@@ -37368,11 +35310,9 @@
           methods
             augment foo @54
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         foo
@@ -37479,21 +35419,17 @@
           fields
             foo @31
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -37505,16 +35441,13 @@
           methods
             augment foo @54
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -37526,12 +35459,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -37629,16 +35560,13 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @35
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -37648,16 +35576,13 @@
           methods
             augment foo @54
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -37668,7 +35593,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       methods
         foo
@@ -37765,16 +35689,13 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @31
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @39
     <testLibrary>::@fragment::package:test/a.dart
@@ -37786,16 +35707,13 @@
           methods
             augment foo @54
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           setter: <none>
@@ -37806,7 +35724,6 @@
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -37895,11 +35812,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -37909,11 +35824,9 @@
           methods
             bar @46
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -38004,7 +35917,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -38014,13 +35926,11 @@
           methods
             foo @46
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 default x @55
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -38120,15 +36030,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo1 @32
               reference: <testLibraryFragment>::@class::A::@method::foo1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
             foo2 @49
               reference: <testLibraryFragment>::@class::A::@method::foo2
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -38139,11 +36046,9 @@
             augment foo1 @54
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo1
               previousFragment: <testLibraryFragment>::@class::A::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -38243,12 +36148,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -38260,15 +36163,12 @@
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo::@def::0
               previousFragment: <testLibraryFragment>::@class::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo::@def::1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
             augment foo @78
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo::@def::1
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo::@def::0
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -38373,12 +36273,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -38391,7 +36289,6 @@
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@class::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0
         class A @79
           reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1
           previousFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0
@@ -38399,11 +36296,9 @@
             augment foo @98
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1::@methodAugmentation::foo
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -38523,12 +36418,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -38542,7 +36435,6 @@
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@class::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
@@ -38553,11 +36445,9 @@
             augment foo @51
               reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -38656,11 +36546,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -38672,11 +36560,9 @@
           methods
             bar @48
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -38781,12 +36667,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -38799,11 +36683,9 @@
             augment foo @56
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -38899,7 +36781,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       mixins
         mixin M1 @40
           reference: <testLibraryFragment>::@mixin::M1
@@ -38915,7 +36796,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       supertype: Object
       constructors
@@ -38925,13 +36805,11 @@
   mixins
     mixin M1
       reference: <testLibraryFragment>::@mixin::M1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M1
       superclassConstraints
         Object
     mixin M2
       reference: <testLibrary>::@fragment::package:test/a.dart::@mixin::M2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixin::M2
       superclassConstraints
         Object
@@ -39083,7 +36961,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class A @50
           reference: <testLibraryFragment>::@class::A
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
@@ -39092,7 +36969,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::B::@constructor::new
                 substitution: {S: T1}
@@ -39132,7 +37008,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         S
       firstFragment: <testLibraryFragment>::@class::B
@@ -39142,7 +37017,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@class::A
@@ -39155,7 +37029,6 @@
   mixins
     mixin M1
       reference: <testLibraryFragment>::@mixin::M1
-      enclosingElement2: <testLibrary>
       typeParameters
         U1
       firstFragment: <testLibraryFragment>::@mixin::M1
@@ -39163,7 +37036,6 @@
         B<U1>
     mixin M2
       reference: <testLibrary>::@fragment::package:test/a.dart::@mixin::M2
-      enclosingElement2: <testLibrary>
       typeParameters
         U2
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixin::M2
@@ -39171,7 +37043,6 @@
         M1<U2>
     mixin M3
       reference: <testLibrary>::@fragment::package:test/b.dart::@mixin::M3
-      enclosingElement2: <testLibrary>
       typeParameters
         U3
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@mixin::M3
@@ -39259,7 +37130,6 @@
           constructors
             foo @29
               reference: <testLibraryFragment>::@class::A::@constructor::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 28
               nameEnd: 32
     <testLibrary>::@fragment::package:test/a.dart
@@ -39271,13 +37141,11 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 _ @61
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         foo
@@ -39286,7 +37154,6 @@
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -39389,16 +37256,13 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @35
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -39408,18 +37272,15 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 _ @61
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -39430,12 +37291,10 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -39528,11 +37387,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -39542,13 +37399,11 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 _ @61
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -39557,7 +37412,6 @@
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -39674,16 +37528,13 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@class::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::foo1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo1= @31
               reference: <testLibraryFragment>::@class::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @40
     <testLibrary>::@fragment::package:test/a.dart
@@ -39695,29 +37546,24 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               setter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
           setters
             set foo2= @45
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 _ @54
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo1
           setter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
           setter: <none>
@@ -39728,7 +37574,6 @@
       setters
         set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -39736,7 +37581,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::foo1
         set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -39851,21 +37695,17 @@
           fields
             foo @31
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setterAugmentation::foo
@@ -39878,19 +37718,16 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 _ @61
               previousFragment: <testLibraryFragment>::@class::A::@setter::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -39902,12 +37739,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -39992,18 +37827,15 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 _ @61
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -40127,26 +37959,21 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@class::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::foo1
             foo2 @-1
               reference: <testLibraryFragment>::@class::A::@field::foo2
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::foo2
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo1= @31
               reference: <testLibraryFragment>::@class::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @40
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setterAugmentation::foo1
             set foo2= @52
               reference: <testLibraryFragment>::@class::A::@setter::foo2
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @61
     <testLibrary>::@fragment::package:test/a.dart
@@ -40158,25 +37985,21 @@
           setters
             augment set foo1= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setterAugmentation::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               parameters
                 _ @62
               previousFragment: <testLibraryFragment>::@class::A::@setter::foo1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo1
           setter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo2
           setter: <none>
@@ -40187,7 +38010,6 @@
       setters
         set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -40195,7 +38017,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::foo2
         set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -40286,7 +38107,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -40301,7 +38121,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -40310,13 +38129,11 @@
   mixins
     mixin A
       reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
       superclassConstraints
         Object
     mixin A
       reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
       superclassConstraints
         Object
@@ -40407,7 +38224,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -40423,7 +38239,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -40432,7 +38247,6 @@
   mixins
     mixin A
       reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
       superclassConstraints
         Object
@@ -40543,7 +38357,6 @@
           constructors
             named @44
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 43
               nameEnd: 49
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::named
@@ -40558,7 +38371,6 @@
           constructors
             augment named @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 50
               nameEnd: 56
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@constructorAugmentation::named
@@ -40572,14 +38384,12 @@
           constructors
             augment named @51
               reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A::@constructorAugmentation::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
               periodOffset: 50
               nameEnd: 56
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::named
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         named
@@ -40661,7 +38471,6 @@
           constructors
             named @29
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 28
               nameEnd: 34
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::named
@@ -40674,14 +38483,12 @@
           constructors
             augment named @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               periodOffset: 50
               nameEnd: 56
               previousFragment: <testLibraryFragment>::@class::A::@constructor::named
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         named
@@ -40759,7 +38566,6 @@
           constructors
             new @27
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::new
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -40770,12 +38576,10 @@
           constructors
             augment new @49
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructorAugmentation::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
               previousFragment: <testLibraryFragment>::@class::A::@constructor::new
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -40875,7 +38679,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/a.dart::<fragment>::@class::A::@constructor::new
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibraryFragment>
@@ -40886,13 +38689,11 @@
           methods
             foo @41
               reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::B::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::B
               parameters
                 a @45
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -40998,11 +38799,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             foo @28
               reference: <testLibraryFragment>::@class::B::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @32
     <testLibrary>::@fragment::package:test/b.dart
@@ -41016,7 +38815,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -41120,11 +38918,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             foo @28
               reference: <testLibraryFragment>::@class::B::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @32
     <testLibrary>::@fragment::package:test/b.dart
@@ -41138,7 +38934,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: Object
       constructors
@@ -41259,13 +39054,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/a.dart::<fragment>::@class::A::@constructor::new
           methods
             foo @55
               reference: <testLibraryFragment>::@class::B::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::B::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @59
     <testLibrary>::@fragment::package:test/b.dart
@@ -41278,13 +39071,11 @@
             augment foo @49
               reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::B::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@class::B::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::B
               parameters
                 a @53
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -41387,10 +39178,8 @@
             foo @32
               reference: <testLibraryFragment>::@class::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
             bar @48
               reference: <testLibraryFragment>::@class::A::@method::bar
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -41403,11 +39192,9 @@
             augment foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         bar
@@ -41478,7 +39265,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -41488,7 +39274,6 @@
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -41556,7 +39341,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -41566,7 +39350,6 @@
   classes
     base class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -41634,7 +39417,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -41644,7 +39426,6 @@
   classes
     final class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -41712,7 +39493,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -41722,7 +39502,6 @@
   classes
     interface class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -41790,7 +39569,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -41800,7 +39578,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -41868,7 +39645,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -41878,7 +39654,6 @@
   classes
     mixin class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -41946,7 +39721,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -41956,7 +39730,6 @@
   classes
     abstract sealed class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -42011,17 +39784,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class I @30
           reference: <testLibraryFragment>::@class::I
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -42029,7 +39799,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class I
       reference: <testLibraryFragment>::@class::I
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I
       constructors
         synthetic new
@@ -42085,14 +39854,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       mixins
         mixin M @30
           reference: <testLibraryFragment>::@mixin::M
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -42101,7 +39868,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -42177,7 +39943,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -42189,7 +39954,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: A<dynamic>
@@ -42282,7 +40046,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @35
           reference: <testLibraryFragment>::@class::B
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::B
@@ -42291,7 +40054,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: T1}
@@ -42306,7 +40068,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -42316,7 +40077,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@class::B
@@ -42427,20 +40187,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @47
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @58
           reference: <testLibraryFragment>::@class::C
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -42459,7 +40216,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -42467,7 +40223,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -42475,7 +40230,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A
       constructors
@@ -42563,13 +40317,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @45
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -42581,7 +40333,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: B
@@ -42592,7 +40343,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
diff --git a/pkg/analyzer/test/src/summary/elements/const_test.dart b/pkg/analyzer/test/src/summary/elements/const_test.dart
index 71a84c7..3af694a 100644
--- a/pkg/analyzer/test/src/summary/elements/const_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/const_test.dart
@@ -75,40 +75,32 @@
       topLevelVariables
         const a @10
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @23
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: num
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -177,40 +169,32 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -270,23 +254,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -383,51 +363,40 @@
           fields
             f1 @29
               reference: <testLibraryFragment>::@class::C::@field::f1
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f1
             f2 @56
               reference: <testLibraryFragment>::@class::C::@field::f2
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f2
             f3 @67
               reference: <testLibraryFragment>::@class::C::@field::f3
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f3
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f1 @-1
               reference: <testLibraryFragment>::@class::C::@getter::f1
-              enclosingFragment: <testLibraryFragment>::@class::C
             get f2 @-1
               reference: <testLibraryFragment>::@class::C::@getter::f2
-              enclosingFragment: <testLibraryFragment>::@class::C
             get f3 @-1
               reference: <testLibraryFragment>::@class::C::@getter::f3
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static const f1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f1
           getter: <none>
         static const f2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f2
           getter: <none>
         static const f3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f3
           getter: <none>
@@ -438,15 +407,12 @@
       getters
         synthetic static get f1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f1
         synthetic static get f2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f2
         synthetic static get f3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f3
 ''');
   }
@@ -580,48 +546,38 @@
           fields
             t @23
               reference: <testLibraryFragment>::@class::C::@field::t
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::t
           constructors
             const new @34
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
             const named @55
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 54
               nameEnd: 60
           getters
             get t @-1
               reference: <testLibraryFragment>::@class::C::@getter::t
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const x @85
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
         const y @114
           reference: <testLibraryFragment>::@topLevelVariable::y
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::y
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
         get y @-1
           reference: <testLibraryFragment>::@getter::y
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: T
           firstFragment: <testLibraryFragment>::@class::C::@field::t
           getter: <none>
@@ -643,29 +599,24 @@
       getters
         synthetic get t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::t
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
     const y
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::y
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
     synthetic static get y
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::y
 ''');
     var x = library.definingCompilationUnit.topLevelVariables[0];
@@ -741,22 +692,18 @@
           constructors
             named @14
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 13
               nameEnd: 19
       topLevelVariables
         const v @31
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         named
@@ -765,14 +712,12 @@
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -825,25 +770,20 @@
           fields
             f @22
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
           constructors
             const new @38
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -854,7 +794,6 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
 ''');
   }
@@ -911,23 +850,19 @@
       topLevelVariables
         const v @44
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: void Function(int)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -991,23 +926,19 @@
       topLevelVariables
         const v @24
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: void Function(int)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -1091,57 +1022,45 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @21
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
         const c @34
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
     const c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
 ''');
   }
@@ -1275,7 +1194,6 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::P::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::P
         class P1 @35
           reference: <testLibraryFragment>::@class::P1
           typeParameters
@@ -1283,7 +1201,6 @@
           constructors
             const new @64
               reference: <testLibraryFragment>::@class::P1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::P1
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::P::@constructor::new
                 substitution: {T: T}
@@ -1294,23 +1211,19 @@
           constructors
             const new @108
               reference: <testLibraryFragment>::@class::P2::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::P2
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::P::@constructor::new
                 substitution: {T: T}
       topLevelVariables
         const values @131
           reference: <testLibraryFragment>::@topLevelVariable::values
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::values
       getters
         get values @-1
           reference: <testLibraryFragment>::@getter::values
-          enclosingFragment: <testLibraryFragment>
   classes
     class P
       reference: <testLibraryFragment>::@class::P
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::P
@@ -1320,7 +1233,6 @@
           firstFragment: <testLibraryFragment>::@class::P::@constructor::new
     class P1
       reference: <testLibraryFragment>::@class::P1
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::P1
@@ -1332,7 +1244,6 @@
           firstFragment: <testLibraryFragment>::@class::P1::@constructor::new
     class P2
       reference: <testLibraryFragment>::@class::P2
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::P2
@@ -1345,14 +1256,12 @@
   topLevelVariables
     const values
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<P<dynamic>>
       firstFragment: <testLibraryFragment>::@topLevelVariable::values
       getter: <none>
   getters
     synthetic static get values
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::values
 ''');
   }
@@ -1425,25 +1334,20 @@
           fields
             f @25
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static const f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -1454,7 +1358,6 @@
       getters
         synthetic static get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
 ''');
   }
@@ -1508,25 +1411,20 @@
           fields
             f @18
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -1537,7 +1435,6 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
 ''');
   }
@@ -1577,23 +1474,19 @@
       topLevelVariables
         const v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -1639,7 +1532,6 @@
           constructors
             const new @19
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               constantInitializers
                 AssertInitializer
                   assertKeyword: assert @25
@@ -1652,7 +1544,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -1707,7 +1598,6 @@
           constructors
             const new @19
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               constantInitializers
                 AssertInitializer
                   assertKeyword: assert @25
@@ -1725,7 +1615,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -1788,12 +1677,10 @@
           fields
             foo @26
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             const new @39
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               constantInitializers
                 ConstructorFieldInitializer
                   fieldName: SimpleIdentifier
@@ -1808,16 +1695,13 @@
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: Object?
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -1828,7 +1712,6 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -1868,23 +1751,19 @@
       topLevelVariables
         const v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -1948,10 +1827,8 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
             const named @51
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 50
               nameEnd: 56
               constantInitializers
@@ -1973,7 +1850,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -2057,13 +1933,11 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @49
           reference: <testLibraryFragment>::@class::B
           constructors
             const new @71
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @77
@@ -2083,7 +1957,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -2098,7 +1971,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -2167,23 +2039,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -2223,23 +2091,19 @@
       topLevelVariables
         const v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: (int,)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -2299,23 +2163,19 @@
       topLevelVariables
         const v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -2355,23 +2215,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -2433,40 +2289,32 @@
       topLevelVariables
         const a @10
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @28
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -2570,22 +2418,18 @@
           constructors
             const named @26
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 25
               nameEnd: 31
       topLevelVariables
         const V @51
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         K
         V
@@ -2604,14 +2448,12 @@
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -2702,23 +2544,19 @@
       topLevelVariables
         const V @23
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -2826,23 +2664,19 @@
       topLevelVariables
         const V @28
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -2914,20 +2748,16 @@
           constructors
             const new @24
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const V @37
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         K
         V
@@ -2939,14 +2769,12 @@
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<dynamic, dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -3034,36 +2862,29 @@
           fields
             t @23
               reference: <testLibraryFragment>::@class::A::@field::t
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::t
           constructors
             const new @34
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get t @-1
               reference: <testLibraryFragment>::@class::A::@getter::t
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         const a @60
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: T
           firstFragment: <testLibraryFragment>::@class::A::@field::t
           getter: <none>
@@ -3078,19 +2899,16 @@
       getters
         synthetic get t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::t
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -3174,20 +2992,16 @@
           constructors
             const new @24
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const V @37
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         K
         V
@@ -3199,14 +3013,12 @@
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -3284,23 +3096,19 @@
       topLevelVariables
         const V @23
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -3395,23 +3203,19 @@
       topLevelVariables
         const V @28
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -3522,22 +3326,18 @@
           constructors
             const named @20
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 19
               nameEnd: 25
       topLevelVariables
         const V @79
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const named
@@ -3562,14 +3362,12 @@
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -3638,23 +3436,19 @@
       topLevelVariables
         const V @23
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -3740,23 +3534,19 @@
       topLevelVariables
         const V @28
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -3821,20 +3611,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const V @17
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -3843,14 +3629,12 @@
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -3902,23 +3686,19 @@
       topLevelVariables
         const V @6
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4003,23 +3783,19 @@
       topLevelVariables
         const V @28
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4101,23 +3877,19 @@
       topLevelVariables
         const V @28
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4174,23 +3946,19 @@
       topLevelVariables
         const V @6
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4260,20 +4028,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const V @20
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -4284,14 +4048,12 @@
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4353,20 +4115,16 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const V @31
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const new
@@ -4375,14 +4133,12 @@
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4446,23 +4202,19 @@
       topLevelVariables
         const V @23
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4543,23 +4295,19 @@
       topLevelVariables
         const V @28
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4607,23 +4355,19 @@
       topLevelVariables
         const V @6
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4700,23 +4444,19 @@
       topLevelVariables
         const V @28
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4768,23 +4508,19 @@
       topLevelVariables
         const V @6
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -4845,40 +4581,32 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -4961,34 +4689,27 @@
           fields
             F @32
               reference: <testLibraryFragment>::@class::C::@field::F
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::F
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get F @-1
               reference: <testLibraryFragment>::@class::C::@getter::F
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const v @52
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static const F
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: String
           firstFragment: <testLibraryFragment>::@class::C::@field::F
           getter: <none>
@@ -4999,19 +4720,16 @@
       getters
         synthetic static get F
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::F
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -5082,23 +4800,19 @@
       topLevelVariables
         const v @27
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -5189,23 +4903,19 @@
       topLevelVariables
         const v @32
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -5250,23 +4960,19 @@
       topLevelVariables
         const v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -5327,40 +5033,32 @@
       topLevelVariables
         const S @13
           reference: <testLibraryFragment>::@topLevelVariable::S
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::S
         const v @30
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get S @-1
           reference: <testLibraryFragment>::@getter::S
-          enclosingFragment: <testLibraryFragment>
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const S
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::S
       getter: <none>
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get S
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::S
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -5422,23 +5120,19 @@
       topLevelVariables
         const v @23
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -5520,23 +5214,19 @@
       topLevelVariables
         const v @28
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -5603,24 +5293,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             length @23
               reference: <testLibraryFragment>::@class::C::@method::length
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const v @47
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -5633,14 +5318,12 @@
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -5700,23 +5383,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -5780,23 +5459,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -5844,23 +5519,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -5928,23 +5599,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -6012,23 +5679,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -6098,23 +5761,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -6168,23 +5827,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -6267,23 +5922,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -6366,23 +6017,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -6454,23 +6101,19 @@
       topLevelVariables
         const b @24
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -6534,25 +6177,20 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             const new @29
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -6567,7 +6205,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -6632,25 +6269,20 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             const new @29
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -6665,7 +6297,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -6729,25 +6360,20 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             const new @29
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -6762,7 +6388,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -6897,41 +6522,34 @@
           constructors
             const positional @20
               reference: <testLibraryFragment>::@class::C::@constructor::positional
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 19
               nameEnd: 30
             const named @55
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 54
               nameEnd: 60
           methods
             methodPositional @81
               reference: <testLibraryFragment>::@class::C::@method::methodPositional
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 default p @99
             methodPositionalWithoutDefault @121
               reference: <testLibraryFragment>::@class::C::@method::methodPositionalWithoutDefault
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 default p @153
             methodNamed @167
               reference: <testLibraryFragment>::@class::C::@method::methodNamed
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 default p @180
                   reference: <testLibraryFragment>::@class::C::@method::methodNamed::@parameter::p
             methodNamedWithoutDefault @201
               reference: <testLibraryFragment>::@class::C::@method::methodNamedWithoutDefault
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 default p @228
                   reference: <testLibraryFragment>::@class::C::@method::methodNamedWithoutDefault::@parameter::p
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const positional
@@ -7037,40 +6655,32 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -7128,40 +6738,32 @@
       topLevelVariables
         const a @11
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @24
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int?
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -7219,40 +6821,32 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -7313,23 +6907,19 @@
       topLevelVariables
         const b @23
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -7391,40 +6981,32 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -7494,40 +7076,32 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: (int, {int a})
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -7598,40 +7172,32 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: (int, {int a})
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -7708,34 +7274,27 @@
           fields
             F @29
               reference: <testLibraryFragment>::@class::C::@field::F
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::F
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get F @-1
               reference: <testLibraryFragment>::@class::C::@getter::F
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const V @45
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static const F
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::F
           getter: <none>
@@ -7746,19 +7305,16 @@
       getters
         synthetic static get F
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::F
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -7822,23 +7378,19 @@
       topLevelVariables
         const V @23
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -7922,23 +7474,19 @@
       topLevelVariables
         const V @28
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -8010,27 +7558,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @23
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @29
                 b @39
       topLevelVariables
         const V @57
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -8050,14 +7593,12 @@
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function(int, String)
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -8121,23 +7662,19 @@
       topLevelVariables
         const V @23
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function(int, String)
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -8221,23 +7758,19 @@
       topLevelVariables
         const V @28
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function(int, String)
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -8310,27 +7843,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       extensions
         extension E @21
           reference: <testLibraryFragment>::@extension::E
           methods
             f @44
               reference: <testLibraryFragment>::@extension::E::@method::f
-              enclosingFragment: <testLibraryFragment>::@extension::E
       topLevelVariables
         const x @59
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -8339,7 +7867,6 @@
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E
       methods
         static f
@@ -8348,14 +7875,12 @@
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: void Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -8401,23 +7926,19 @@
       topLevelVariables
         const V @15
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -8471,23 +7992,19 @@
       topLevelVariables
         const V @26
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: R Function<P, R>(P)
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -8541,23 +8058,19 @@
       topLevelVariables
         const V @23
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -8632,23 +8145,19 @@
       topLevelVariables
         const V @28
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -8710,40 +8219,32 @@
       topLevelVariables
         const A @6
           reference: <testLibraryFragment>::@topLevelVariable::A
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::A
         const B @19
           reference: <testLibraryFragment>::@topLevelVariable::B
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::B
       getters
         get A @-1
           reference: <testLibraryFragment>::@getter::A
-          enclosingFragment: <testLibraryFragment>
         get B @-1
           reference: <testLibraryFragment>::@getter::B
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const A
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::A
       getter: <none>
     const B
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::B
       getter: <none>
   getters
     synthetic static get A
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::A
     synthetic static get B
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::B
 ''');
   }
@@ -8805,23 +8306,19 @@
       topLevelVariables
         const B @23
           reference: <testLibraryFragment>::@topLevelVariable::B
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::B
       getters
         get B @-1
           reference: <testLibraryFragment>::@getter::B
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const B
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::B
       getter: <none>
   getters
     synthetic static get B
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::B
 ''');
   }
@@ -8904,23 +8401,19 @@
       topLevelVariables
         const B @28
           reference: <testLibraryFragment>::@topLevelVariable::B
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::B
       getters
         get B @-1
           reference: <testLibraryFragment>::@getter::B
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const B
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::B
       getter: <none>
   getters
     synthetic static get B
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::B
 ''');
   }
@@ -9186,7 +8679,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @17
           reference: <testLibraryFragment>::@class::D
           typeParameters
@@ -9194,99 +8686,74 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
       enums
         enum E @30
           reference: <testLibraryFragment>::@enum::E
           fields
             enumConstant a @33
               reference: <testLibraryFragment>::@enum::E::@field::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::a
             enumConstant b @36
               reference: <testLibraryFragment>::@enum::E::@field::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::b
             enumConstant c @39
               reference: <testLibraryFragment>::@enum::E::@field::c
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::c
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get a @-1
               reference: <testLibraryFragment>::@enum::E::@getter::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get b @-1
               reference: <testLibraryFragment>::@enum::E::@getter::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get c @-1
               reference: <testLibraryFragment>::@enum::E::@getter::c
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         const vDynamic @76
           reference: <testLibraryFragment>::@topLevelVariable::vDynamic
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDynamic
         const vNull @102
           reference: <testLibraryFragment>::@topLevelVariable::vNull
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNull
         const vObject @122
           reference: <testLibraryFragment>::@topLevelVariable::vObject
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vObject
         const vClass @146
           reference: <testLibraryFragment>::@topLevelVariable::vClass
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vClass
         const vGenericClass @164
           reference: <testLibraryFragment>::@topLevelVariable::vGenericClass
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vGenericClass
         const vEnum @189
           reference: <testLibraryFragment>::@topLevelVariable::vEnum
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vEnum
         const vFunctionTypeAlias @206
           reference: <testLibraryFragment>::@topLevelVariable::vFunctionTypeAlias
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vFunctionTypeAlias
       getters
         get vDynamic @-1
           reference: <testLibraryFragment>::@getter::vDynamic
-          enclosingFragment: <testLibraryFragment>
         get vNull @-1
           reference: <testLibraryFragment>::@getter::vNull
-          enclosingFragment: <testLibraryFragment>
         get vObject @-1
           reference: <testLibraryFragment>::@getter::vObject
-          enclosingFragment: <testLibraryFragment>
         get vClass @-1
           reference: <testLibraryFragment>::@getter::vClass
-          enclosingFragment: <testLibraryFragment>
         get vGenericClass @-1
           reference: <testLibraryFragment>::@getter::vGenericClass
-          enclosingFragment: <testLibraryFragment>
         get vEnum @-1
           reference: <testLibraryFragment>::@getter::vEnum
-          enclosingFragment: <testLibraryFragment>
         get vFunctionTypeAlias @-1
           reference: <testLibraryFragment>::@getter::vFunctionTypeAlias
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -9294,7 +8761,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::D
@@ -9305,31 +8771,26 @@
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::a
           getter: <none>
         static const b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::b
           getter: <none>
         static const c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::c
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -9340,91 +8801,73 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::b
         synthetic static get c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::c
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     const vDynamic
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDynamic
       getter: <none>
     const vNull
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNull
       getter: <none>
     const vObject
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vObject
       getter: <none>
     const vClass
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vClass
       getter: <none>
     const vGenericClass
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vGenericClass
       getter: <none>
     const vEnum
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vEnum
       getter: <none>
     const vFunctionTypeAlias
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vFunctionTypeAlias
       getter: <none>
   getters
     synthetic static get vDynamic
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDynamic
     synthetic static get vNull
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNull
     synthetic static get vObject
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vObject
     synthetic static get vClass
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vClass
     synthetic static get vGenericClass
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vGenericClass
     synthetic static get vEnum
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vEnum
     synthetic static get vFunctionTypeAlias
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vFunctionTypeAlias
 ''');
   }
@@ -9479,25 +8922,20 @@
           fields
             f @31
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: List<dynamic Function()>
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -9508,7 +8946,6 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
 ''');
   }
@@ -9594,57 +9031,45 @@
       topLevelVariables
         const vClass @23
           reference: <testLibraryFragment>::@topLevelVariable::vClass
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vClass
         const vEnum @41
           reference: <testLibraryFragment>::@topLevelVariable::vEnum
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vEnum
         const vFunctionTypeAlias @58
           reference: <testLibraryFragment>::@topLevelVariable::vFunctionTypeAlias
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vFunctionTypeAlias
       getters
         get vClass @-1
           reference: <testLibraryFragment>::@getter::vClass
-          enclosingFragment: <testLibraryFragment>
         get vEnum @-1
           reference: <testLibraryFragment>::@getter::vEnum
-          enclosingFragment: <testLibraryFragment>
         get vFunctionTypeAlias @-1
           reference: <testLibraryFragment>::@getter::vFunctionTypeAlias
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vClass
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vClass
       getter: <none>
     const vEnum
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vEnum
       getter: <none>
     const vFunctionTypeAlias
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vFunctionTypeAlias
       getter: <none>
   getters
     synthetic static get vClass
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vClass
     synthetic static get vEnum
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vEnum
     synthetic static get vFunctionTypeAlias
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vFunctionTypeAlias
 ''');
   }
@@ -9767,57 +9192,45 @@
       topLevelVariables
         const vClass @28
           reference: <testLibraryFragment>::@topLevelVariable::vClass
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vClass
         const vEnum @48
           reference: <testLibraryFragment>::@topLevelVariable::vEnum
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vEnum
         const vFunctionTypeAlias @67
           reference: <testLibraryFragment>::@topLevelVariable::vFunctionTypeAlias
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vFunctionTypeAlias
       getters
         get vClass @-1
           reference: <testLibraryFragment>::@getter::vClass
-          enclosingFragment: <testLibraryFragment>
         get vEnum @-1
           reference: <testLibraryFragment>::@getter::vEnum
-          enclosingFragment: <testLibraryFragment>
         get vFunctionTypeAlias @-1
           reference: <testLibraryFragment>::@getter::vFunctionTypeAlias
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vClass
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vClass
       getter: <none>
     const vEnum
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vEnum
       getter: <none>
     const vFunctionTypeAlias
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::vFunctionTypeAlias
       getter: <none>
   getters
     synthetic static get vClass
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vClass
     synthetic static get vEnum
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vEnum
     synthetic static get vFunctionTypeAlias
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vFunctionTypeAlias
 ''');
   }
@@ -9870,27 +9283,22 @@
           fields
             f @21
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: List<T>
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -9901,7 +9309,6 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
 ''');
   }
@@ -9941,23 +9348,19 @@
       topLevelVariables
         const V @6
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -10017,20 +9420,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const V @17
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10039,14 +9438,12 @@
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -10128,23 +9525,19 @@
       topLevelVariables
         const V @30
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
 ''');
   }
@@ -10205,23 +9598,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -10270,23 +9659,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -10356,23 +9741,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -10442,23 +9823,19 @@
       topLevelVariables
         const x @13
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Object
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -10879,312 +10256,240 @@
       topLevelVariables
         const vEqual @6
           reference: <testLibraryFragment>::@topLevelVariable::vEqual
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vEqual
         const vAnd @29
           reference: <testLibraryFragment>::@topLevelVariable::vAnd
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vAnd
         const vOr @57
           reference: <testLibraryFragment>::@topLevelVariable::vOr
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vOr
         const vBitXor @84
           reference: <testLibraryFragment>::@topLevelVariable::vBitXor
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBitXor
         const vBitAnd @107
           reference: <testLibraryFragment>::@topLevelVariable::vBitAnd
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBitAnd
         const vBitOr @130
           reference: <testLibraryFragment>::@topLevelVariable::vBitOr
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBitOr
         const vBitShiftLeft @152
           reference: <testLibraryFragment>::@topLevelVariable::vBitShiftLeft
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBitShiftLeft
         const vBitShiftRight @182
           reference: <testLibraryFragment>::@topLevelVariable::vBitShiftRight
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBitShiftRight
         const vAdd @213
           reference: <testLibraryFragment>::@topLevelVariable::vAdd
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vAdd
         const vSubtract @233
           reference: <testLibraryFragment>::@topLevelVariable::vSubtract
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vSubtract
         const vMiltiply @258
           reference: <testLibraryFragment>::@topLevelVariable::vMiltiply
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vMiltiply
         const vDivide @283
           reference: <testLibraryFragment>::@topLevelVariable::vDivide
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDivide
         const vFloorDivide @306
           reference: <testLibraryFragment>::@topLevelVariable::vFloorDivide
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vFloorDivide
         const vModulo @335
           reference: <testLibraryFragment>::@topLevelVariable::vModulo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vModulo
         const vGreater @358
           reference: <testLibraryFragment>::@topLevelVariable::vGreater
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vGreater
         const vGreaterEqual @382
           reference: <testLibraryFragment>::@topLevelVariable::vGreaterEqual
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vGreaterEqual
         const vLess @412
           reference: <testLibraryFragment>::@topLevelVariable::vLess
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vLess
         const vLessEqual @433
           reference: <testLibraryFragment>::@topLevelVariable::vLessEqual
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vLessEqual
       getters
         get vEqual @-1
           reference: <testLibraryFragment>::@getter::vEqual
-          enclosingFragment: <testLibraryFragment>
         get vAnd @-1
           reference: <testLibraryFragment>::@getter::vAnd
-          enclosingFragment: <testLibraryFragment>
         get vOr @-1
           reference: <testLibraryFragment>::@getter::vOr
-          enclosingFragment: <testLibraryFragment>
         get vBitXor @-1
           reference: <testLibraryFragment>::@getter::vBitXor
-          enclosingFragment: <testLibraryFragment>
         get vBitAnd @-1
           reference: <testLibraryFragment>::@getter::vBitAnd
-          enclosingFragment: <testLibraryFragment>
         get vBitOr @-1
           reference: <testLibraryFragment>::@getter::vBitOr
-          enclosingFragment: <testLibraryFragment>
         get vBitShiftLeft @-1
           reference: <testLibraryFragment>::@getter::vBitShiftLeft
-          enclosingFragment: <testLibraryFragment>
         get vBitShiftRight @-1
           reference: <testLibraryFragment>::@getter::vBitShiftRight
-          enclosingFragment: <testLibraryFragment>
         get vAdd @-1
           reference: <testLibraryFragment>::@getter::vAdd
-          enclosingFragment: <testLibraryFragment>
         get vSubtract @-1
           reference: <testLibraryFragment>::@getter::vSubtract
-          enclosingFragment: <testLibraryFragment>
         get vMiltiply @-1
           reference: <testLibraryFragment>::@getter::vMiltiply
-          enclosingFragment: <testLibraryFragment>
         get vDivide @-1
           reference: <testLibraryFragment>::@getter::vDivide
-          enclosingFragment: <testLibraryFragment>
         get vFloorDivide @-1
           reference: <testLibraryFragment>::@getter::vFloorDivide
-          enclosingFragment: <testLibraryFragment>
         get vModulo @-1
           reference: <testLibraryFragment>::@getter::vModulo
-          enclosingFragment: <testLibraryFragment>
         get vGreater @-1
           reference: <testLibraryFragment>::@getter::vGreater
-          enclosingFragment: <testLibraryFragment>
         get vGreaterEqual @-1
           reference: <testLibraryFragment>::@getter::vGreaterEqual
-          enclosingFragment: <testLibraryFragment>
         get vLess @-1
           reference: <testLibraryFragment>::@getter::vLess
-          enclosingFragment: <testLibraryFragment>
         get vLessEqual @-1
           reference: <testLibraryFragment>::@getter::vLessEqual
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vEqual
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vEqual
       getter: <none>
     const vAnd
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vAnd
       getter: <none>
     const vOr
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vOr
       getter: <none>
     const vBitXor
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBitXor
       getter: <none>
     const vBitAnd
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBitAnd
       getter: <none>
     const vBitOr
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBitOr
       getter: <none>
     const vBitShiftLeft
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBitShiftLeft
       getter: <none>
     const vBitShiftRight
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBitShiftRight
       getter: <none>
     const vAdd
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vAdd
       getter: <none>
     const vSubtract
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vSubtract
       getter: <none>
     const vMiltiply
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vMiltiply
       getter: <none>
     const vDivide
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDivide
       getter: <none>
     const vFloorDivide
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vFloorDivide
       getter: <none>
     const vModulo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vModulo
       getter: <none>
     const vGreater
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vGreater
       getter: <none>
     const vGreaterEqual
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vGreaterEqual
       getter: <none>
     const vLess
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vLess
       getter: <none>
     const vLessEqual
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vLessEqual
       getter: <none>
   getters
     synthetic static get vEqual
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vEqual
     synthetic static get vAnd
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vAnd
     synthetic static get vOr
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vOr
     synthetic static get vBitXor
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBitXor
     synthetic static get vBitAnd
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBitAnd
     synthetic static get vBitOr
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBitOr
     synthetic static get vBitShiftLeft
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBitShiftLeft
     synthetic static get vBitShiftRight
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBitShiftRight
     synthetic static get vAdd
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vAdd
     synthetic static get vSubtract
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vSubtract
     synthetic static get vMiltiply
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vMiltiply
     synthetic static get vDivide
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDivide
     synthetic static get vFloorDivide
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vFloorDivide
     synthetic static get vModulo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vModulo
     synthetic static get vGreater
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vGreater
     synthetic static get vGreaterEqual
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vGreaterEqual
     synthetic static get vLess
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vLess
     synthetic static get vLessEqual
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vLessEqual
 ''');
   }
@@ -11245,23 +10550,19 @@
       topLevelVariables
         const vConditional @6
           reference: <testLibraryFragment>::@topLevelVariable::vConditional
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vConditional
       getters
         get vConditional @-1
           reference: <testLibraryFragment>::@getter::vConditional
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vConditional
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vConditional
       getter: <none>
   getters
     synthetic static get vConditional
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vConditional
 ''');
   }
@@ -11322,23 +10623,19 @@
       topLevelVariables
         const vIdentical @6
           reference: <testLibraryFragment>::@topLevelVariable::vIdentical
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIdentical
       getters
         get vIdentical @-1
           reference: <testLibraryFragment>::@getter::vIdentical
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vIdentical
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIdentical
       getter: <none>
   getters
     synthetic static get vIdentical
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIdentical
 ''');
   }
@@ -11385,23 +10682,19 @@
       topLevelVariables
         const vIfNull @6
           reference: <testLibraryFragment>::@topLevelVariable::vIfNull
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIfNull
       getters
         get vIfNull @-1
           reference: <testLibraryFragment>::@getter::vIfNull
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vIfNull
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: num
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIfNull
       getter: <none>
   getters
     synthetic static get vIfNull
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIfNull
 ''');
   }
@@ -11641,227 +10934,175 @@
       topLevelVariables
         const vNull @6
           reference: <testLibraryFragment>::@topLevelVariable::vNull
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNull
         const vBoolFalse @26
           reference: <testLibraryFragment>::@topLevelVariable::vBoolFalse
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBoolFalse
         const vBoolTrue @52
           reference: <testLibraryFragment>::@topLevelVariable::vBoolTrue
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBoolTrue
         const vIntPositive @76
           reference: <testLibraryFragment>::@topLevelVariable::vIntPositive
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIntPositive
         const vIntNegative @100
           reference: <testLibraryFragment>::@topLevelVariable::vIntNegative
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIntNegative
         const vIntLong1 @125
           reference: <testLibraryFragment>::@topLevelVariable::vIntLong1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIntLong1
         const vIntLong2 @163
           reference: <testLibraryFragment>::@topLevelVariable::vIntLong2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIntLong2
         const vIntLong3 @201
           reference: <testLibraryFragment>::@topLevelVariable::vIntLong3
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIntLong3
         const vDouble @239
           reference: <testLibraryFragment>::@topLevelVariable::vDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDouble
         const vString @260
           reference: <testLibraryFragment>::@topLevelVariable::vString
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vString
         const vStringConcat @283
           reference: <testLibraryFragment>::@topLevelVariable::vStringConcat
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vStringConcat
         const vStringInterpolation @318
           reference: <testLibraryFragment>::@topLevelVariable::vStringInterpolation
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vStringInterpolation
         const vSymbol @372
           reference: <testLibraryFragment>::@topLevelVariable::vSymbol
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vSymbol
       getters
         get vNull @-1
           reference: <testLibraryFragment>::@getter::vNull
-          enclosingFragment: <testLibraryFragment>
         get vBoolFalse @-1
           reference: <testLibraryFragment>::@getter::vBoolFalse
-          enclosingFragment: <testLibraryFragment>
         get vBoolTrue @-1
           reference: <testLibraryFragment>::@getter::vBoolTrue
-          enclosingFragment: <testLibraryFragment>
         get vIntPositive @-1
           reference: <testLibraryFragment>::@getter::vIntPositive
-          enclosingFragment: <testLibraryFragment>
         get vIntNegative @-1
           reference: <testLibraryFragment>::@getter::vIntNegative
-          enclosingFragment: <testLibraryFragment>
         get vIntLong1 @-1
           reference: <testLibraryFragment>::@getter::vIntLong1
-          enclosingFragment: <testLibraryFragment>
         get vIntLong2 @-1
           reference: <testLibraryFragment>::@getter::vIntLong2
-          enclosingFragment: <testLibraryFragment>
         get vIntLong3 @-1
           reference: <testLibraryFragment>::@getter::vIntLong3
-          enclosingFragment: <testLibraryFragment>
         get vDouble @-1
           reference: <testLibraryFragment>::@getter::vDouble
-          enclosingFragment: <testLibraryFragment>
         get vString @-1
           reference: <testLibraryFragment>::@getter::vString
-          enclosingFragment: <testLibraryFragment>
         get vStringConcat @-1
           reference: <testLibraryFragment>::@getter::vStringConcat
-          enclosingFragment: <testLibraryFragment>
         get vStringInterpolation @-1
           reference: <testLibraryFragment>::@getter::vStringInterpolation
-          enclosingFragment: <testLibraryFragment>
         get vSymbol @-1
           reference: <testLibraryFragment>::@getter::vSymbol
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vNull
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNull
       getter: <none>
     const vBoolFalse
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBoolFalse
       getter: <none>
     const vBoolTrue
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBoolTrue
       getter: <none>
     const vIntPositive
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIntPositive
       getter: <none>
     const vIntNegative
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIntNegative
       getter: <none>
     const vIntLong1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIntLong1
       getter: <none>
     const vIntLong2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIntLong2
       getter: <none>
     const vIntLong3
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIntLong3
       getter: <none>
     const vDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDouble
       getter: <none>
     const vString
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::vString
       getter: <none>
     const vStringConcat
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::vStringConcat
       getter: <none>
     const vStringInterpolation
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::vStringInterpolation
       getter: <none>
     const vSymbol
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Symbol
       firstFragment: <testLibraryFragment>::@topLevelVariable::vSymbol
       getter: <none>
   getters
     synthetic static get vNull
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNull
     synthetic static get vBoolFalse
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBoolFalse
     synthetic static get vBoolTrue
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBoolTrue
     synthetic static get vIntPositive
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIntPositive
     synthetic static get vIntNegative
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIntNegative
     synthetic static get vIntLong1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIntLong1
     synthetic static get vIntLong2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIntLong2
     synthetic static get vIntLong3
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIntLong3
     synthetic static get vDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDouble
     synthetic static get vString
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vString
     synthetic static get vStringConcat
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vStringConcat
     synthetic static get vStringInterpolation
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vStringInterpolation
     synthetic static get vSymbol
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vSymbol
 ''');
   }
@@ -11926,40 +11167,32 @@
       topLevelVariables
         const a @11
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @24
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int?
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String?
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -12027,40 +11260,32 @@
       topLevelVariables
         const a @11
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @24
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int?
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int?
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -12128,40 +11353,32 @@
       topLevelVariables
         const a @14
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @40
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String?
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int?>
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -12281,57 +11498,45 @@
       topLevelVariables
         const v1 @10
           reference: <testLibraryFragment>::@topLevelVariable::v1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v1
         const v2 @38
           reference: <testLibraryFragment>::@topLevelVariable::v2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v2
         const v3 @63
           reference: <testLibraryFragment>::@topLevelVariable::v3
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v3
       getters
         get v1 @-1
           reference: <testLibraryFragment>::@getter::v1
-          enclosingFragment: <testLibraryFragment>
         get v2 @-1
           reference: <testLibraryFragment>::@getter::v2
-          enclosingFragment: <testLibraryFragment>
         get v3 @-1
           reference: <testLibraryFragment>::@getter::v3
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v1
       getter: <none>
     const v2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v2
       getter: <none>
     const v3
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v3
       getter: <none>
   getters
     synthetic static get v1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v1
     synthetic static get v2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v2
     synthetic static get v3
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v3
 ''');
   }
@@ -12432,74 +11637,58 @@
       topLevelVariables
         const vNotEqual @6
           reference: <testLibraryFragment>::@topLevelVariable::vNotEqual
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNotEqual
         const vNot @32
           reference: <testLibraryFragment>::@topLevelVariable::vNot
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNot
         const vNegate @52
           reference: <testLibraryFragment>::@topLevelVariable::vNegate
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNegate
         const vComplement @72
           reference: <testLibraryFragment>::@topLevelVariable::vComplement
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vComplement
       getters
         get vNotEqual @-1
           reference: <testLibraryFragment>::@getter::vNotEqual
-          enclosingFragment: <testLibraryFragment>
         get vNot @-1
           reference: <testLibraryFragment>::@getter::vNot
-          enclosingFragment: <testLibraryFragment>
         get vNegate @-1
           reference: <testLibraryFragment>::@getter::vNegate
-          enclosingFragment: <testLibraryFragment>
         get vComplement @-1
           reference: <testLibraryFragment>::@getter::vComplement
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vNotEqual
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNotEqual
       getter: <none>
     const vNot
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNot
       getter: <none>
     const vNegate
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNegate
       getter: <none>
     const vComplement
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vComplement
       getter: <none>
   getters
     synthetic static get vNotEqual
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNotEqual
     synthetic static get vNot
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNot
     synthetic static get vNegate
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNegate
     synthetic static get vComplement
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vComplement
 ''');
   }
@@ -12538,23 +11727,19 @@
       topLevelVariables
         const vSuper @6
           reference: <testLibraryFragment>::@topLevelVariable::vSuper
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vSuper
       getters
         get vSuper @-1
           reference: <testLibraryFragment>::@getter::vSuper
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vSuper
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::vSuper
       getter: <none>
   getters
     synthetic static get vSuper
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vSuper
 ''');
   }
@@ -12593,23 +11778,19 @@
       topLevelVariables
         const vThis @6
           reference: <testLibraryFragment>::@topLevelVariable::vThis
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vThis
       getters
         get vThis @-1
           reference: <testLibraryFragment>::@getter::vThis
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vThis
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::vThis
       getter: <none>
   getters
     synthetic static get vThis
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vThis
 ''');
   }
@@ -12651,23 +11832,19 @@
       topLevelVariables
         const c @6
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Never
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
 ''');
   }
@@ -12884,108 +12061,84 @@
       topLevelVariables
         const vNull @6
           reference: <testLibraryFragment>::@topLevelVariable::vNull
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNull
         const vDynamic @36
           reference: <testLibraryFragment>::@topLevelVariable::vDynamic
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDynamic
         const vInterfaceNoTypeParameters @79
           reference: <testLibraryFragment>::@topLevelVariable::vInterfaceNoTypeParameters
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInterfaceNoTypeParameters
         const vInterfaceNoTypeArguments @136
           reference: <testLibraryFragment>::@topLevelVariable::vInterfaceNoTypeArguments
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInterfaceNoTypeArguments
         const vInterfaceWithTypeArguments @186
           reference: <testLibraryFragment>::@topLevelVariable::vInterfaceWithTypeArguments
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments
         const vInterfaceWithTypeArguments2 @246
           reference: <testLibraryFragment>::@topLevelVariable::vInterfaceWithTypeArguments2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments2
       getters
         get vNull @-1
           reference: <testLibraryFragment>::@getter::vNull
-          enclosingFragment: <testLibraryFragment>
         get vDynamic @-1
           reference: <testLibraryFragment>::@getter::vDynamic
-          enclosingFragment: <testLibraryFragment>
         get vInterfaceNoTypeParameters @-1
           reference: <testLibraryFragment>::@getter::vInterfaceNoTypeParameters
-          enclosingFragment: <testLibraryFragment>
         get vInterfaceNoTypeArguments @-1
           reference: <testLibraryFragment>::@getter::vInterfaceNoTypeArguments
-          enclosingFragment: <testLibraryFragment>
         get vInterfaceWithTypeArguments @-1
           reference: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments
-          enclosingFragment: <testLibraryFragment>
         get vInterfaceWithTypeArguments2 @-1
           reference: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments2
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vNull
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<Null>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNull
       getter: <none>
     const vDynamic
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDynamic
       getter: <none>
     const vInterfaceNoTypeParameters
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInterfaceNoTypeParameters
       getter: <none>
     const vInterfaceNoTypeArguments
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<List<dynamic>>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInterfaceNoTypeArguments
       getter: <none>
     const vInterfaceWithTypeArguments
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<List<String>>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInterfaceWithTypeArguments
       getter: <none>
     const vInterfaceWithTypeArguments2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<Map<int, List<String>>>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInterfaceWithTypeArguments2
       getter: <none>
   getters
     synthetic static get vNull
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNull
     synthetic static get vDynamic
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDynamic
     synthetic static get vInterfaceNoTypeParameters
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInterfaceNoTypeParameters
     synthetic static get vInterfaceNoTypeArguments
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInterfaceNoTypeArguments
     synthetic static get vInterfaceWithTypeArguments
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments
     synthetic static get vInterfaceWithTypeArguments2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments2
 ''');
   }
@@ -13046,23 +12199,19 @@
       topLevelVariables
         const v @23
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<C>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -13140,23 +12289,19 @@
       topLevelVariables
         const v @28
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<C>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -13216,23 +12361,19 @@
       topLevelVariables
         const v @32
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int Function(String)>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -13381,74 +12522,58 @@
       topLevelVariables
         const vDynamic1 @6
           reference: <testLibraryFragment>::@topLevelVariable::vDynamic1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDynamic1
         const vDynamic2 @48
           reference: <testLibraryFragment>::@topLevelVariable::vDynamic2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDynamic2
         const vInterface @90
           reference: <testLibraryFragment>::@topLevelVariable::vInterface
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInterface
         const vInterfaceWithTypeArguments @132
           reference: <testLibraryFragment>::@topLevelVariable::vInterfaceWithTypeArguments
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments
       getters
         get vDynamic1 @-1
           reference: <testLibraryFragment>::@getter::vDynamic1
-          enclosingFragment: <testLibraryFragment>
         get vDynamic2 @-1
           reference: <testLibraryFragment>::@getter::vDynamic2
-          enclosingFragment: <testLibraryFragment>
         get vInterface @-1
           reference: <testLibraryFragment>::@getter::vInterface
-          enclosingFragment: <testLibraryFragment>
         get vInterfaceWithTypeArguments @-1
           reference: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vDynamic1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<dynamic, int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDynamic1
       getter: <none>
     const vDynamic2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<int, dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDynamic2
       getter: <none>
     const vInterface
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInterface
       getter: <none>
     const vInterfaceWithTypeArguments
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<int, List<String>>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInterfaceWithTypeArguments
       getter: <none>
   getters
     synthetic static get vDynamic1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDynamic1
     synthetic static get vDynamic2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDynamic2
     synthetic static get vInterface
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInterface
     synthetic static get vInterfaceWithTypeArguments
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments
 ''');
   }
@@ -13556,57 +12681,45 @@
       topLevelVariables
         const vDynamic1 @6
           reference: <testLibraryFragment>::@topLevelVariable::vDynamic1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDynamic1
         const vInterface @43
           reference: <testLibraryFragment>::@topLevelVariable::vInterface
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInterface
         const vInterfaceWithTypeArguments @77
           reference: <testLibraryFragment>::@topLevelVariable::vInterfaceWithTypeArguments
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments
       getters
         get vDynamic1 @-1
           reference: <testLibraryFragment>::@getter::vDynamic1
-          enclosingFragment: <testLibraryFragment>
         get vInterface @-1
           reference: <testLibraryFragment>::@getter::vInterface
-          enclosingFragment: <testLibraryFragment>
         get vInterfaceWithTypeArguments @-1
           reference: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const vDynamic1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Set<dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDynamic1
       getter: <none>
     const vInterface
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Set<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInterface
       getter: <none>
     const vInterfaceWithTypeArguments
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Set<List<String>>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInterfaceWithTypeArguments
       getter: <none>
   getters
     synthetic static get vDynamic1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDynamic1
     synthetic static get vInterface
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInterface
     synthetic static get vInterfaceWithTypeArguments
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInterfaceWithTypeArguments
 ''');
   }
@@ -13657,23 +12770,19 @@
       topLevelVariables
         const v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -13737,23 +12846,19 @@
       topLevelVariables
         const v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -13805,23 +12910,19 @@
       topLevelVariables
         const v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Set<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -13871,23 +12972,19 @@
       topLevelVariables
         const v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -14046,88 +13143,68 @@
           fields
             enumConstant a @8
               reference: <testLibraryFragment>::@enum::E::@field::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::a
             enumConstant b @11
               reference: <testLibraryFragment>::@enum::E::@field::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::b
             enumConstant c @14
               reference: <testLibraryFragment>::@enum::E::@field::c
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::c
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get a @-1
               reference: <testLibraryFragment>::@enum::E::@getter::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get b @-1
               reference: <testLibraryFragment>::@enum::E::@getter::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get c @-1
               reference: <testLibraryFragment>::@enum::E::@getter::c
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         final vValue @23
           reference: <testLibraryFragment>::@topLevelVariable::vValue
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vValue
         final vValues @43
           reference: <testLibraryFragment>::@topLevelVariable::vValues
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vValues
         final vIndex @69
           reference: <testLibraryFragment>::@topLevelVariable::vIndex
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIndex
       getters
         get vValue @-1
           reference: <testLibraryFragment>::@getter::vValue
-          enclosingFragment: <testLibraryFragment>
         get vValues @-1
           reference: <testLibraryFragment>::@getter::vValues
-          enclosingFragment: <testLibraryFragment>
         get vIndex @-1
           reference: <testLibraryFragment>::@getter::vIndex
-          enclosingFragment: <testLibraryFragment>
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::a
           getter: <none>
         static const b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::b
           getter: <none>
         static const c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::c
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -14138,51 +13215,41 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::b
         synthetic static get c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::c
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     final vValue
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::vValue
       getter: <none>
     final vValues
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<E>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vValues
       getter: <none>
     final vIndex
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIndex
       getter: <none>
   getters
     synthetic static get vValue
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vValue
     synthetic static get vValues
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vValues
     synthetic static get vIndex
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIndex
 ''');
   }
@@ -14271,48 +13338,38 @@
           fields
             enumConstant a @8
               reference: <testLibraryFragment>::@enum::E::@field::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::a
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get a @-1
               reference: <testLibraryFragment>::@enum::E::@getter::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         final vToString @17
           reference: <testLibraryFragment>::@topLevelVariable::vToString
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vToString
       getters
         get vToString @-1
           reference: <testLibraryFragment>::@getter::vToString
-          enclosingFragment: <testLibraryFragment>
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::a
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -14323,23 +13380,19 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::a
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     final vToString
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::vToString
       getter: <none>
   getters
     synthetic static get vToString
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vToString
 ''');
   }
@@ -14406,38 +13459,30 @@
           fields
             a @25
               reference: <testLibraryFragment>::@class::C::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::a
             b @47
               reference: <testLibraryFragment>::@class::C::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::b
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::C::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::C
             get b @-1
               reference: <testLibraryFragment>::@class::C::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::a
           getter: <none>
         static const b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::b
           getter: <none>
@@ -14448,11 +13493,9 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::b
 ''');
   }
@@ -14511,29 +13554,23 @@
           fields
             a @25
               reference: <testLibraryFragment>::@class::C::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::a
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::C::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @41
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic Function()
           firstFragment: <testLibraryFragment>::@class::C::@field::a
           getter: <none>
@@ -14544,7 +13581,6 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::a
       methods
         static m
diff --git a/pkg/analyzer/test/src/summary/elements/default_value_test.dart b/pkg/analyzer/test/src/summary/elements/default_value_test.dart
index 3264f9a..b84bb4e 100644
--- a/pkg/analyzer/test/src/summary/elements/default_value_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/default_value_test.dart
@@ -68,18 +68,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             X @21
               reference: <testLibraryFragment>::@class::A::@method::X
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 default a @32
                   reference: <testLibraryFragment>::@class::A::@method::X::@parameter::a
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -191,25 +188,20 @@
           fields
             f @71
               reference: <testLibraryFragment>::@class::X::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::f
           constructors
             const new @82
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::X::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::X
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: void Function(dynamic)
             alias: <testLibraryFragment>::@typeAlias::F
               typeArguments
@@ -230,7 +222,6 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::f
 ''');
   }
@@ -320,24 +311,20 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @34
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             foo @45
               reference: <testLibraryFragment>::@class::B::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 default a @50
                   reference: <testLibraryFragment>::@class::B::@method::foo::@parameter::a
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -347,7 +334,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -683,23 +669,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       extensions
         extension E @21
           reference: <testLibraryFragment>::@extension::E
           methods
             f @44
               reference: <testLibraryFragment>::@extension::E::@method::f
-              enclosingFragment: <testLibraryFragment>::@extension::E
             g @65
               reference: <testLibraryFragment>::@extension::E::@method::g
-              enclosingFragment: <testLibraryFragment>::@extension::E
               parameters
                 default p @75
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -708,7 +690,6 @@
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E
       methods
         static f
@@ -797,23 +778,19 @@
           constructors
             const new @26
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @39
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             foo @50
               reference: <testLibraryFragment>::@class::C::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 default b @70
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
         T2
@@ -824,7 +801,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -909,7 +885,6 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @34
           reference: <testLibraryFragment>::@class::C
           typeParameters
@@ -917,11 +892,9 @@
           constructors
             const new @49
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -931,7 +904,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -1029,7 +1001,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @29
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -1037,7 +1008,6 @@
           constructors
             const new @60
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @73
           reference: <testLibraryFragment>::@class::C
           typeParameters
@@ -1045,11 +1015,9 @@
           constructors
             const new @114
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -1059,7 +1027,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -1069,7 +1036,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -1148,11 +1114,9 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -1236,17 +1200,14 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @34
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             foo @45
               reference: <testLibraryFragment>::@class::C::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               typeParameters
                 T @49
               parameters
@@ -1254,7 +1215,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -1264,7 +1224,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1362,7 +1321,6 @@
           constructors
             const new @26
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @39
           reference: <testLibraryFragment>::@class::C
           typeParameters
@@ -1370,11 +1328,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             foo @54
               reference: <testLibraryFragment>::@class::C::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               typeParameters
                 E2 @58
               parameters
@@ -1382,7 +1338,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
         T2
@@ -1393,7 +1348,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         E1
       firstFragment: <testLibraryFragment>::@class::C
@@ -1487,7 +1441,6 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @34
           reference: <testLibraryFragment>::@class::C
           typeParameters
@@ -1495,17 +1448,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             foo @48
               reference: <testLibraryFragment>::@class::C::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 default b @58
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -1515,7 +1465,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
diff --git a/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart b/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart
index 1721194..aaa700c 100644
--- a/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart
@@ -161,82 +161,64 @@
           fields
             f01 @25
               reference: <testLibraryFragment>::@class::A::@def::0::@field::f01
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::0
               getter2: <testLibraryFragment>::@class::A::@def::0::@getter::f01
             f02 @49
               reference: <testLibraryFragment>::@class::A::@def::0::@field::f02
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::0
               getter2: <testLibraryFragment>::@class::A::@def::0::@getter::f02
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@def::0::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::0
           getters
             get f01 @-1
               reference: <testLibraryFragment>::@class::A::@def::0::@getter::f01
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::0
             get f02 @-1
               reference: <testLibraryFragment>::@class::A::@def::0::@getter::f02
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::0
         class A @69
           reference: <testLibraryFragment>::@class::A::@def::1
           fields
             f11 @88
               reference: <testLibraryFragment>::@class::A::@def::1::@field::f11
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::1
               getter2: <testLibraryFragment>::@class::A::@def::1::@getter::f11
             f12 @112
               reference: <testLibraryFragment>::@class::A::@def::1::@field::f12
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::1
               getter2: <testLibraryFragment>::@class::A::@def::1::@getter::f12
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@def::1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::1
           getters
             get f11 @-1
               reference: <testLibraryFragment>::@class::A::@def::1::@getter::f11
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::1
             get f12 @-1
               reference: <testLibraryFragment>::@class::A::@def::1::@getter::f12
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::1
         class A @132
           reference: <testLibraryFragment>::@class::A::@def::2
           fields
             f21 @151
               reference: <testLibraryFragment>::@class::A::@def::2::@field::f21
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::2
               getter2: <testLibraryFragment>::@class::A::@def::2::@getter::f21
             f22 @175
               reference: <testLibraryFragment>::@class::A::@def::2::@field::f22
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::2
               getter2: <testLibraryFragment>::@class::A::@def::2::@getter::f22
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@def::2::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::2
           getters
             get f21 @-1
               reference: <testLibraryFragment>::@class::A::@def::2::@getter::f21
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::2
             get f22 @-1
               reference: <testLibraryFragment>::@class::A::@def::2::@getter::f22
-              enclosingFragment: <testLibraryFragment>::@class::A::@def::2
   classes
     class A
       reference: <testLibraryFragment>::@class::A::@def::0
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A::@def::0
       fields
         static const f01
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::0
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@def::0::@field::f01
           getter: <none>
         static const f02
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::0
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@def::0::@field::f02
           getter: <none>
@@ -247,26 +229,21 @@
       getters
         synthetic static get f01
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::0
           firstFragment: <testLibraryFragment>::@class::A::@def::0::@getter::f01
         synthetic static get f02
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::0
           firstFragment: <testLibraryFragment>::@class::A::@def::0::@getter::f02
     class A
       reference: <testLibraryFragment>::@class::A::@def::1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A::@def::1
       fields
         static const f11
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::1
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@def::1::@field::f11
           getter: <none>
         static const f12
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::1
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@def::1::@field::f12
           getter: <none>
@@ -277,26 +254,21 @@
       getters
         synthetic static get f11
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::1
           firstFragment: <testLibraryFragment>::@class::A::@def::1::@getter::f11
         synthetic static get f12
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::1
           firstFragment: <testLibraryFragment>::@class::A::@def::1::@getter::f12
     class A
       reference: <testLibraryFragment>::@class::A::@def::2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A::@def::2
       fields
         static const f21
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::2
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@def::2::@field::f21
           getter: <none>
         static const f22
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::2
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@def::2::@field::f22
           getter: <none>
@@ -307,11 +279,9 @@
       getters
         synthetic static get f21
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::2
           firstFragment: <testLibraryFragment>::@class::A::@def::2::@getter::f21
         synthetic static get f22
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A::@def::2
           firstFragment: <testLibraryFragment>::@class::A::@def::2::@getter::f22
 ''');
   }
@@ -357,18 +327,15 @@
           constructors
             named @14
               reference: <testLibraryFragment>::@class::A::@constructor::named::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 13
               nameEnd: 19
             named @27
               reference: <testLibraryFragment>::@class::A::@constructor::named::@def::1
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 26
               nameEnd: 32
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         named
@@ -460,52 +427,42 @@
           fields
             foo @16
               reference: <testLibraryFragment>::@class::A::@field::foo::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo::@def::0
               setter2: <testLibraryFragment>::@class::A::@setter::foo::@def::0
             foo @30
               reference: <testLibraryFragment>::@class::A::@field::foo::@def::1
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo::@def::1
               setter2: <testLibraryFragment>::@class::A::@setter::foo::@def::1
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::A
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo::@def::1
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo::@def::1
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo::@def::0
           getter: <none>
           setter: <none>
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: double
           firstFragment: <testLibraryFragment>::@class::A::@field::foo::@def::1
           getter: <none>
@@ -517,16 +474,13 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo::@def::0
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo::@def::1
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -534,7 +488,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::foo::@def::0
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -586,18 +539,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @17
               reference: <testLibraryFragment>::@class::A::@method::foo::@def::0
-              enclosingFragment: <testLibraryFragment>::@class::A
             foo @33
               reference: <testLibraryFragment>::@class::A::@method::foo::@def::1
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -696,19 +645,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @17
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class X @28
           reference: <testLibraryFragment>::@class::X::@def::0
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@def::0::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X::@def::0
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -722,7 +668,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@def::1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X::@def::1
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -737,7 +682,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -745,7 +689,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -753,7 +696,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class alias X
       reference: <testLibraryFragment>::@class::X::@def::0
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X::@def::0
       supertype: A
       constructors
@@ -763,7 +705,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@def::0::@constructor::new
     class alias X
       reference: <testLibraryFragment>::@class::X::@def::1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X::@def::1
       supertype: B
       constructors
@@ -774,7 +715,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -979,88 +919,68 @@
           fields
             enumConstant a @8
               reference: <testLibraryFragment>::@enum::E::@def::0::@field::a
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::0
               getter2: <testLibraryFragment>::@enum::E::@def::0::@getter::a
             enumConstant b @11
               reference: <testLibraryFragment>::@enum::E::@def::0::@field::b
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::0
               getter2: <testLibraryFragment>::@enum::E::@def::0::@getter::b
             values @-1
               reference: <testLibraryFragment>::@enum::E::@def::0::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::0
               getter2: <testLibraryFragment>::@enum::E::@def::0::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@def::0::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::0
           getters
             get a @-1
               reference: <testLibraryFragment>::@enum::E::@def::0::@getter::a
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::0
             get b @-1
               reference: <testLibraryFragment>::@enum::E::@def::0::@getter::b
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::0
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@def::0::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::0
         enum E @19
           reference: <testLibraryFragment>::@enum::E::@def::1
           fields
             enumConstant c @22
               reference: <testLibraryFragment>::@enum::E::@def::1::@field::c
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::1
               getter2: <testLibraryFragment>::@enum::E::@def::1::@getter::c
             enumConstant d @25
               reference: <testLibraryFragment>::@enum::E::@def::1::@field::d
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::1
               getter2: <testLibraryFragment>::@enum::E::@def::1::@getter::d
             enumConstant e @28
               reference: <testLibraryFragment>::@enum::E::@def::1::@field::e
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::1
               getter2: <testLibraryFragment>::@enum::E::@def::1::@getter::e
             values @-1
               reference: <testLibraryFragment>::@enum::E::@def::1::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::1
               getter2: <testLibraryFragment>::@enum::E::@def::1::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@def::1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::1
           getters
             get c @-1
               reference: <testLibraryFragment>::@enum::E::@def::1::@getter::c
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::1
             get d @-1
               reference: <testLibraryFragment>::@enum::E::@def::1::@getter::d
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::1
             get e @-1
               reference: <testLibraryFragment>::@enum::E::@def::1::@getter::e
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::1
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@def::1::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E::@def::1
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E::@def::0
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E::@def::0
       supertype: Enum
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::0
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@def::0::@field::a
           getter: <none>
         static const b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::0
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@def::0::@field::b
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::0
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@def::0::@field::values
           getter: <none>
@@ -1071,43 +991,35 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::0
           firstFragment: <testLibraryFragment>::@enum::E::@def::0::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::0
           firstFragment: <testLibraryFragment>::@enum::E::@def::0::@getter::b
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::0
           firstFragment: <testLibraryFragment>::@enum::E::@def::0::@getter::values
     enum E
       reference: <testLibraryFragment>::@enum::E::@def::1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E::@def::1
       supertype: Enum
       fields
         static const c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::1
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@def::1::@field::c
           getter: <none>
         static const d
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::1
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@def::1::@field::d
           getter: <none>
         static const e
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::1
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@def::1::@field::e
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::1
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@def::1::@field::values
           getter: <none>
@@ -1118,19 +1030,15 @@
       getters
         synthetic static get c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::1
           firstFragment: <testLibraryFragment>::@enum::E::@def::1::@getter::c
         synthetic static get d
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::1
           firstFragment: <testLibraryFragment>::@enum::E::@def::1::@getter::d
         synthetic static get e
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::1
           firstFragment: <testLibraryFragment>::@enum::E::@def::1::@getter::e
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E::@def::1
           firstFragment: <testLibraryFragment>::@enum::E::@def::1::@getter::values
 ''');
   }
@@ -1214,17 +1122,14 @@
           fields
             x @56
               reference: <testLibraryFragment>::@extension::E::@def::1::@field::x
-              enclosingFragment: <testLibraryFragment>::@extension::E::@def::1
               getter2: <testLibraryFragment>::@extension::E::@def::1::@getter::x
               setter2: <testLibraryFragment>::@extension::E::@def::1::@setter::x
           getters
             get x @-1
               reference: <testLibraryFragment>::@extension::E::@def::1::@getter::x
-              enclosingFragment: <testLibraryFragment>::@extension::E::@def::1
           setters
             set x= @-1
               reference: <testLibraryFragment>::@extension::E::@def::1::@setter::x
-              enclosingFragment: <testLibraryFragment>::@extension::E::@def::1
               parameters
                 _x @-1
         extension E @71
@@ -1232,32 +1137,26 @@
           fields
             y @95
               reference: <testLibraryFragment>::@extension::E::@def::2::@field::y
-              enclosingFragment: <testLibraryFragment>::@extension::E::@def::2
               getter2: <testLibraryFragment>::@extension::E::@def::2::@getter::y
               setter2: <testLibraryFragment>::@extension::E::@def::2::@setter::y
           getters
             get y @-1
               reference: <testLibraryFragment>::@extension::E::@def::2::@getter::y
-              enclosingFragment: <testLibraryFragment>::@extension::E::@def::2
           setters
             set y= @-1
               reference: <testLibraryFragment>::@extension::E::@def::2::@setter::y
-              enclosingFragment: <testLibraryFragment>::@extension::E::@def::2
               parameters
                 _y @-1
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E::@def::0
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E::@def::0
     extension E
       reference: <testLibraryFragment>::@extension::E::@def::1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E::@def::1
       fields
         static x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E::@def::1
           type: dynamic
           firstFragment: <testLibraryFragment>::@extension::E::@def::1::@field::x
           getter: <none>
@@ -1265,12 +1164,10 @@
       getters
         synthetic static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E::@def::1
           firstFragment: <testLibraryFragment>::@extension::E::@def::1::@getter::x
       setters
         synthetic static set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E::@def::1
           parameters
             requiredPositional _x
               reference: <none>
@@ -1278,12 +1175,10 @@
           firstFragment: <testLibraryFragment>::@extension::E::@def::1::@setter::x
     extension E
       reference: <testLibraryFragment>::@extension::E::@def::2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E::@def::2
       fields
         static y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E::@def::2
           type: int
           firstFragment: <testLibraryFragment>::@extension::E::@def::2::@field::y
           getter: <none>
@@ -1291,12 +1186,10 @@
       getters
         synthetic static get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E::@def::2
           firstFragment: <testLibraryFragment>::@extension::E::@def::2::@getter::y
       setters
         synthetic static set y=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E::@def::2
           parameters
             requiredPositional _y
               reference: <none>
@@ -1378,41 +1271,33 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::E::@def::0::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::E::@def::0
               getter2: <testLibraryFragment>::@extensionType::E::@def::0::@getter::it
           constructors
             new @15
               reference: <testLibraryFragment>::@extensionType::E::@def::0::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::E::@def::0
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::E::@def::0::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::E::@def::0
         extension type E @43
           reference: <testLibraryFragment>::@extensionType::E::@def::1
           fields
             it @52
               reference: <testLibraryFragment>::@extensionType::E::@def::1::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::E::@def::1
               getter2: <testLibraryFragment>::@extensionType::E::@def::1::@getter::it
           constructors
             new @43
               reference: <testLibraryFragment>::@extensionType::E::@def::1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::E::@def::1
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::E::@def::1::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::E::@def::1
   extensionTypes
     extension type E
       reference: <testLibraryFragment>::@extensionType::E::@def::0
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::E::@def::0
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::E::@def::0
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::E::@def::0::@field::it
           getter: <none>
@@ -1427,17 +1312,14 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::E::@def::0
           firstFragment: <testLibraryFragment>::@extensionType::E::@def::0::@getter::it
     extension type E
       reference: <testLibraryFragment>::@extensionType::E::@def::1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::E::@def::1
       typeErasure: double
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::E::@def::1
           type: double
           firstFragment: <testLibraryFragment>::@extensionType::E::@def::1::@field::it
           getter: <none>
@@ -1452,7 +1334,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::E::@def::1
           firstFragment: <testLibraryFragment>::@extensionType::E::@def::1::@getter::it
 ''');
   }
@@ -1660,17 +1541,14 @@
           fields
             x @27
               reference: <testLibraryFragment>::@mixin::A::@def::1::@field::x
-              enclosingFragment: <testLibraryFragment>::@mixin::A::@def::1
               getter2: <testLibraryFragment>::@mixin::A::@def::1::@getter::x
               setter2: <testLibraryFragment>::@mixin::A::@def::1::@setter::x
           getters
             get x @-1
               reference: <testLibraryFragment>::@mixin::A::@def::1::@getter::x
-              enclosingFragment: <testLibraryFragment>::@mixin::A::@def::1
           setters
             set x= @-1
               reference: <testLibraryFragment>::@mixin::A::@def::1::@setter::x
-              enclosingFragment: <testLibraryFragment>::@mixin::A::@def::1
               parameters
                 _x @-1
         mixin A @38
@@ -1678,36 +1556,30 @@
           fields
             y @48
               reference: <testLibraryFragment>::@mixin::A::@def::2::@field::y
-              enclosingFragment: <testLibraryFragment>::@mixin::A::@def::2
               getter2: <testLibraryFragment>::@mixin::A::@def::2::@getter::y
               setter2: <testLibraryFragment>::@mixin::A::@def::2::@setter::y
           getters
             get y @-1
               reference: <testLibraryFragment>::@mixin::A::@def::2::@getter::y
-              enclosingFragment: <testLibraryFragment>::@mixin::A::@def::2
           setters
             set y= @-1
               reference: <testLibraryFragment>::@mixin::A::@def::2::@setter::y
-              enclosingFragment: <testLibraryFragment>::@mixin::A::@def::2
               parameters
                 _y @-1
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A::@def::0
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A::@def::0
       superclassConstraints
         Object
     mixin A
       reference: <testLibraryFragment>::@mixin::A::@def::1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A::@def::1
       superclassConstraints
         Object
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A::@def::1
           type: dynamic
           firstFragment: <testLibraryFragment>::@mixin::A::@def::1::@field::x
           getter: <none>
@@ -1715,12 +1587,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A::@def::1
           firstFragment: <testLibraryFragment>::@mixin::A::@def::1::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A::@def::1
           parameters
             requiredPositional _x
               reference: <none>
@@ -1728,14 +1598,12 @@
           firstFragment: <testLibraryFragment>::@mixin::A::@def::1::@setter::x
     mixin A
       reference: <testLibraryFragment>::@mixin::A::@def::2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A::@def::2
       superclassConstraints
         Object
       fields
         y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A::@def::2
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@def::2::@field::y
           getter: <none>
@@ -1743,12 +1611,10 @@
       getters
         synthetic get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A::@def::2
           firstFragment: <testLibraryFragment>::@mixin::A::@def::2::@getter::y
       setters
         synthetic set y=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A::@def::2
           parameters
             requiredPositional _y
               reference: <none>
@@ -1862,76 +1728,61 @@
       topLevelVariables
         x @5
           reference: <testLibraryFragment>::@topLevelVariable::x::@def::0
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x::@def::0
           setter2: <testLibraryFragment>::@setter::x::@def::0
         x @12
           reference: <testLibraryFragment>::@topLevelVariable::x::@def::1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x::@def::1
           setter2: <testLibraryFragment>::@setter::x::@def::1
         final x @21
           reference: <testLibraryFragment>::@topLevelVariable::x::@def::2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x::@def::2
         x @32
           reference: <testLibraryFragment>::@topLevelVariable::x::@def::3
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x::@def::3
           setter2: <testLibraryFragment>::@setter::x::@def::2
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x::@def::0
-          enclosingFragment: <testLibraryFragment>
         get x @-1
           reference: <testLibraryFragment>::@getter::x::@def::1
-          enclosingFragment: <testLibraryFragment>
         get x @-1
           reference: <testLibraryFragment>::@getter::x::@def::2
-          enclosingFragment: <testLibraryFragment>
         get x @-1
           reference: <testLibraryFragment>::@getter::x::@def::3
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x::@def::0
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
         set x= @-1
           reference: <testLibraryFragment>::@setter::x::@def::1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
         set x= @-1
           reference: <testLibraryFragment>::@setter::x::@def::2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::x::@def::0
       getter: <none>
       setter: <none>
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::x::@def::1
       getter: <none>
       setter: <none>
     final x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x::@def::2
       getter: <none>
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::x::@def::3
       getter: <none>
@@ -1939,24 +1790,19 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x::@def::0
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x::@def::1
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x::@def::2
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x::@def::3
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -1964,7 +1810,6 @@
       firstFragment: <testLibraryFragment>::@setter::x::@def::0
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -1972,7 +1817,6 @@
       firstFragment: <testLibraryFragment>::@setter::x::@def::1
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -2022,30 +1866,24 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo::@def::1
       getters
         get foo @8
           reference: <testLibraryFragment>::@getter::foo::@def::0
-          enclosingFragment: <testLibraryFragment>
         get foo @26
           reference: <testLibraryFragment>::@getter::foo::@def::1
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo::@def::0
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo::@def::1
 ''');
   }
@@ -2097,30 +1935,25 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::foo::@def::1
       setters
         set foo= @4
           reference: <testLibraryFragment>::@setter::foo::@def::0
-          enclosingFragment: <testLibraryFragment>
           parameters
             _ @12
         set foo= @22
           reference: <testLibraryFragment>::@setter::foo::@def::1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _ @33
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       setter: <none>
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -2128,7 +1961,6 @@
       firstFragment: <testLibraryFragment>::@setter::foo::@def::0
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
diff --git a/pkg/analyzer/test/src/summary/elements/enum_test.dart b/pkg/analyzer/test/src/summary/elements/enum_test.dart
index b8b3b28..98f5f62 100644
--- a/pkg/analyzer/test/src/summary/elements/enum_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/enum_test.dart
@@ -153,41 +153,31 @@
           fields
             enumConstant aaa @11
               reference: <testLibraryFragment>::@enum::E::@field::aaa
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::aaa
             enumConstant bbb @16
               reference: <testLibraryFragment>::@enum::E::@field::bbb
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::bbb
             enumConstant ccc @21
               reference: <testLibraryFragment>::@enum::E::@field::ccc
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::ccc
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get aaa @-1
               reference: <testLibraryFragment>::@enum::E::@getter::aaa
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get bbb @-1
               reference: <testLibraryFragment>::@enum::E::@getter::bbb
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get ccc @-1
               reference: <testLibraryFragment>::@enum::E::@getter::ccc
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 26
       firstFragment: <testLibraryFragment>::@enum::E
@@ -195,25 +185,21 @@
       fields
         static const aaa
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::aaa
           getter: <none>
         static const bbb
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::bbb
           getter: <none>
         static const ccc
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::ccc
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -224,19 +210,15 @@
       getters
         synthetic static get aaa
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::aaa
         synthetic static get bbb
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::bbb
         synthetic static get ccc
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::ccc
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -360,34 +342,26 @@
           fields
             enumConstant int @14
               reference: <testLibraryFragment>::@enum::E::@field::int
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::int
             enumConstant string @22
               reference: <testLibraryFragment>::@enum::E::@field::string
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::string
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             const new @43
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get int @-1
               reference: <testLibraryFragment>::@enum::E::@getter::int
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get string @-1
               reference: <testLibraryFragment>::@enum::E::@getter::string
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::E
@@ -395,19 +369,16 @@
       fields
         static const int
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E<int>
           firstFragment: <testLibraryFragment>::@enum::E::@field::int
           getter: <none>
         static const string
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E<String>
           firstFragment: <testLibraryFragment>::@enum::E::@field::string
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -422,15 +393,12 @@
       getters
         synthetic static get int
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::int
         synthetic static get string
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::string
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -510,39 +478,31 @@
           fields
             enumConstant _name @11
               reference: <testLibraryFragment>::@enum::E::@field::_name
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::_name
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get _name @-1
               reference: <testLibraryFragment>::@enum::E::@getter::_name
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const _name
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::_name
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -553,11 +513,9 @@
       getters
         synthetic static get _name
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::_name
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -659,27 +617,21 @@
           fields
             enumConstant v @14
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             const new @37
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::E
@@ -687,13 +639,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E<double>
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -708,11 +658,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -791,39 +739,31 @@
           fields
             enumConstant _ @11
               reference: <testLibraryFragment>::@enum::E::@field::_
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::_
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get _ @-1
               reference: <testLibraryFragment>::@enum::E::@getter::_
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const _
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::_
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -834,11 +774,9 @@
       getters
         synthetic static get _
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::_
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -923,44 +861,35 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             factory named @26
               reference: <testLibraryFragment>::@enum::E::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@enum::E
               periodOffset: 25
               nameEnd: 31
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -974,11 +903,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -1058,39 +985,31 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             factory new @24
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -1101,11 +1020,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -1201,52 +1118,41 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             x @22
               reference: <testLibraryFragment>::@enum::E::@field::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::x
           constructors
             const new @33
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get x @-1
               reference: <testLibraryFragment>::@enum::E::@getter::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: dynamic
           firstFragment: <testLibraryFragment>::@enum::E::@field::x
           getter: <none>
@@ -1265,15 +1171,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::x
 ''');
   }
@@ -1376,65 +1279,51 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             x @26
               reference: <testLibraryFragment>::@enum::E::@field::x::@def::0
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::x::@def::0
             x @44
               reference: <testLibraryFragment>::@enum::E::@field::x::@def::1
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::x::@def::1
           constructors
             const new @55
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get x @-1
               reference: <testLibraryFragment>::@enum::E::@getter::x::@def::0
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get x @-1
               reference: <testLibraryFragment>::@enum::E::@getter::x::@def::1
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: int
           firstFragment: <testLibraryFragment>::@enum::E::@field::x::@def::0
           getter: <none>
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: String
           firstFragment: <testLibraryFragment>::@enum::E::@field::x::@def::1
           getter: <none>
@@ -1449,19 +1338,15 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::x::@def::0
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::x::@def::1
 ''');
   }
@@ -1545,39 +1430,31 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             const new @22
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -1592,11 +1469,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -1702,52 +1577,41 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             x @26
               reference: <testLibraryFragment>::@enum::E::@field::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::x
           constructors
             const new @37
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get x @-1
               reference: <testLibraryFragment>::@enum::E::@getter::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: int
           firstFragment: <testLibraryFragment>::@enum::E::@field::x
           getter: <none>
@@ -1762,15 +1626,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::x
 ''');
   }
@@ -1863,52 +1724,41 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             x @26
               reference: <testLibraryFragment>::@enum::E::@field::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::x
           constructors
             const new @37
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get x @-1
               reference: <testLibraryFragment>::@enum::E::@getter::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: num
           firstFragment: <testLibraryFragment>::@enum::E::@field::x
           getter: <none>
@@ -1923,15 +1773,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::x
 ''');
   }
@@ -2024,52 +1871,41 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             x @22
               reference: <testLibraryFragment>::@enum::E::@field::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::x
           constructors
             new @27
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get x @-1
               reference: <testLibraryFragment>::@enum::E::@getter::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: dynamic
           firstFragment: <testLibraryFragment>::@enum::E::@field::x
           getter: <none>
@@ -2084,15 +1920,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::x
 ''');
   }
@@ -2185,52 +2018,41 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             x @22
               reference: <testLibraryFragment>::@enum::E::@field::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::x
           constructors
             new @27
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get x @-1
               reference: <testLibraryFragment>::@enum::E::@getter::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: dynamic
           firstFragment: <testLibraryFragment>::@enum::E::@field::x
           getter: <none>
@@ -2245,15 +2067,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::x
 ''');
   }
@@ -2347,41 +2166,33 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             const named @34
               reference: <testLibraryFragment>::@enum::E::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@enum::E
               periodOffset: 33
               nameEnd: 39
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -2396,11 +2207,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -2487,39 +2296,31 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             const new @26
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -2534,11 +2335,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -2662,20 +2461,16 @@
           fields
             enumConstant v @14
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             x @29
               reference: <testLibraryFragment>::@enum::E::@field::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::x
           constructors
             const new @40
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
               constantInitializers
                 AssertInitializer
                   assertKeyword: assert @50
@@ -2704,17 +2499,13 @@
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get x @-1
               reference: <testLibraryFragment>::@enum::E::@getter::x
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::E
@@ -2722,19 +2513,16 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E<dynamic>
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: int
           firstFragment: <testLibraryFragment>::@enum::E::@field::x
           getter: <none>
@@ -2749,15 +2537,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::x
 ''');
   }
@@ -2838,40 +2623,32 @@
           fields
             enumConstant v @69
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       documentationComment: /**\n * Docs\n */
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -2882,11 +2659,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -2979,52 +2754,41 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             foo @22
               reference: <testLibraryFragment>::@enum::E::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get foo @-1
               reference: <testLibraryFragment>::@enum::E::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: int
           firstFragment: <testLibraryFragment>::@enum::E::@field::foo
           getter: <none>
@@ -3035,15 +2799,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::foo
 ''');
   }
@@ -3088,30 +2849,25 @@
           fields
             promotable _foo @33
               reference: <testLibraryFragment>::@enum::E::@field::_foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::_foo
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         final _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: int?
           firstFragment: <testLibraryFragment>::@enum::E::@field::_foo
           getter: <none>
@@ -3126,15 +2882,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         synthetic get _foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::_foo
 ''');
   }
@@ -3222,52 +2975,41 @@
           fields
             enumConstant v @10
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             foo @-1
               reference: <testLibraryFragment>::@enum::E::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get foo @23
               reference: <testLibraryFragment>::@enum::E::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: int
           firstFragment: <testLibraryFragment>::@enum::E::@field::foo
           getter: <none>
@@ -3278,15 +3020,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::foo
 ''');
   }
@@ -3376,34 +3115,27 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I
       enums
         enum E @16
           reference: <testLibraryFragment>::@enum::E
           fields
             enumConstant v @35
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   classes
     class I
       reference: <testLibraryFragment>::@class::I
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I
       constructors
         synthetic new
@@ -3412,19 +3144,16 @@
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -3435,11 +3164,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -3528,85 +3255,69 @@
           fields
             enumConstant v @78
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       extensionTypes
         extension type B @26
           reference: <testLibraryFragment>::@extensionType::B
           fields
             it @32
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   extensionTypes
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
 ''');
   }
@@ -3706,7 +3417,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I
       enums
         enum E @19
           reference: <testLibraryFragment>::@enum::E
@@ -3715,27 +3425,21 @@
           fields
             enumConstant v @44
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   classes
     class I
       reference: <testLibraryFragment>::@class::I
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::I
@@ -3746,7 +3450,6 @@
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         U
       firstFragment: <testLibraryFragment>::@enum::E
@@ -3754,13 +3457,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E<dynamic>
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -3771,11 +3472,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -3874,40 +3573,32 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
         class Z @17
           reference: <testLibraryFragment>::@class::Z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::Z::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::Z
       enums
         enum E @27
           reference: <testLibraryFragment>::@enum::E
           fields
             enumConstant v @52
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       constructors
         synthetic new
@@ -3915,7 +3606,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@constructor::new
     class Z
       reference: <testLibraryFragment>::@class::Z
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::Z
       constructors
         synthetic new
@@ -3924,19 +3614,16 @@
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -3947,11 +3634,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -4051,27 +3736,21 @@
           fields
             enumConstant v @14
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
           methods
             foo @23
               reference: <testLibraryFragment>::@enum::E::@method::foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
               typeParameters
                 U @27
               parameters
@@ -4080,7 +3759,6 @@
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::E
@@ -4088,13 +3766,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E<dynamic>
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -4105,11 +3781,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
       methods
         foo
@@ -4207,43 +3881,34 @@
           fields
             enumConstant v @11
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
           methods
             toString @23
               reference: <testLibraryFragment>::@enum::E::@method::toString
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -4254,11 +3919,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
       methods
         toString
@@ -4350,42 +4013,34 @@
           fields
             enumConstant v @29
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       mixins
         mixin M @6
           reference: <testLibraryFragment>::@mixin::M
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -4396,16 +4051,13 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -4496,85 +4148,69 @@
           fields
             enumConstant v @72
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       extensionTypes
         extension type B @26
           reference: <testLibraryFragment>::@extensionType::B
           fields
             it @32
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   extensionTypes
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
 ''');
   }
@@ -4675,23 +4311,18 @@
           fields
             enumConstant v @67
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       mixins
         mixin M1 @6
           reference: <testLibraryFragment>::@mixin::M1
@@ -4704,19 +4335,16 @@
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -4727,16 +4355,13 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   mixins
     mixin M1
       reference: <testLibraryFragment>::@mixin::M1
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::M1
@@ -4744,7 +4369,6 @@
         Object
     mixin M2
       reference: <testLibraryFragment>::@mixin::M2
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::M2
@@ -4839,55 +4463,44 @@
           fields
             enumConstant v @10
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             foo @-1
               reference: <testLibraryFragment>::@enum::E::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
               setter2: <testLibraryFragment>::@enum::E::@setter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
           setters
             set foo= @19
               reference: <testLibraryFragment>::@enum::E::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
               parameters
                 _ @27
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: int
           firstFragment: <testLibraryFragment>::@enum::E::@field::foo
           setter: <none>
@@ -4898,16 +4511,13 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           parameters
             requiredPositional _
               reference: <none>
@@ -4997,27 +4607,21 @@
           fields
             enumConstant v @14
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::E
@@ -5025,13 +4629,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E<dynamic>
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -5042,11 +4644,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -5137,27 +4737,21 @@
           fields
             enumConstant v @39
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: num
@@ -5168,13 +4762,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E<num, num>
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<num, num>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -5185,11 +4777,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -5246,20 +4836,16 @@
           fields
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: dynamic
@@ -5268,7 +4854,6 @@
       fields
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -5279,7 +4864,6 @@
       getters
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -5344,20 +4928,16 @@
           fields
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: dynamic
@@ -5370,7 +4950,6 @@
       fields
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic, num, dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -5381,7 +4960,6 @@
       getters
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -5438,20 +5016,16 @@
           fields
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: void Function(E<dynamic>)
@@ -5460,7 +5034,6 @@
       fields
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -5471,7 +5044,6 @@
       getters
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -5527,20 +5099,16 @@
           fields
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::E
@@ -5548,7 +5116,6 @@
       fields
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -5559,7 +5126,6 @@
       getters
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -5615,20 +5181,16 @@
           fields
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::E
@@ -5636,7 +5198,6 @@
       fields
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -5647,7 +5208,6 @@
       getters
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -5703,20 +5263,16 @@
           fields
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::E
@@ -5724,7 +5280,6 @@
       fields
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -5735,7 +5290,6 @@
       getters
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -5797,20 +5351,16 @@
           fields
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -5820,7 +5370,6 @@
       fields
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic, dynamic, dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -5831,7 +5380,6 @@
       getters
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -5941,52 +5489,41 @@
           fields
             enumConstant a @32
               reference: <testLibraryFragment>::@enum::E::@field::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::a
             enumConstant b @47
               reference: <testLibraryFragment>::@enum::E::@field::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::b
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get a @-1
               reference: <testLibraryFragment>::@enum::E::@getter::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get b @-1
               reference: <testLibraryFragment>::@enum::E::@getter::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::a
           getter: <none>
         static const b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::b
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -5997,15 +5534,12 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::b
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -6151,61 +5685,48 @@
           fields
             enumConstant a @46
               reference: <testLibraryFragment>::@enum::E::@field::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::a
             enumConstant b @75
               reference: <testLibraryFragment>::@enum::E::@field::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::b
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get a @-1
               reference: <testLibraryFragment>::@enum::E::@getter::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get b @-1
               reference: <testLibraryFragment>::@enum::E::@getter::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         const annotation @91
           reference: <testLibraryFragment>::@topLevelVariable::annotation
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::annotation
       getters
         get annotation @-1
           reference: <testLibraryFragment>::@getter::annotation
-          enclosingFragment: <testLibraryFragment>
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::a
           getter: <none>
         static const b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::b
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -6216,27 +5737,22 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::b
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     const annotation
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::annotation
       getter: <none>
   getters
     synthetic static get annotation
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::annotation
 ''');
   }
@@ -6336,52 +5852,41 @@
           fields
             enumConstant v1 @9
               reference: <testLibraryFragment>::@enum::E::@field::v1
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v1
             enumConstant v2 @13
               reference: <testLibraryFragment>::@enum::E::@field::v2
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v2
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v1 @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v1
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get v2 @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v2
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v1
           getter: <none>
         static const v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v2
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -6392,15 +5897,12 @@
       getters
         synthetic static get v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v1
         synthetic static get v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v2
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -6524,61 +6026,48 @@
           fields
             enumConstant v1 @10
               reference: <testLibraryFragment>::@enum::E1::@field::v1
-              enclosingFragment: <testLibraryFragment>::@enum::E1
               getter2: <testLibraryFragment>::@enum::E1::@getter::v1
             values @-1
               reference: <testLibraryFragment>::@enum::E1::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E1
               getter2: <testLibraryFragment>::@enum::E1::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E1
           getters
             get v1 @-1
               reference: <testLibraryFragment>::@enum::E1::@getter::v1
-              enclosingFragment: <testLibraryFragment>::@enum::E1
             get values @-1
               reference: <testLibraryFragment>::@enum::E1::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E1
         enum E2 @20
           reference: <testLibraryFragment>::@enum::E2
           fields
             enumConstant v2 @25
               reference: <testLibraryFragment>::@enum::E2::@field::v2
-              enclosingFragment: <testLibraryFragment>::@enum::E2
               getter2: <testLibraryFragment>::@enum::E2::@getter::v2
             values @-1
               reference: <testLibraryFragment>::@enum::E2::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E2
               getter2: <testLibraryFragment>::@enum::E2::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E2::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E2
           getters
             get v2 @-1
               reference: <testLibraryFragment>::@enum::E2::@getter::v2
-              enclosingFragment: <testLibraryFragment>::@enum::E2
             get values @-1
               reference: <testLibraryFragment>::@enum::E2::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E2
   enums
     enum E1
       reference: <testLibraryFragment>::@enum::E1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E1
       supertype: Enum
       fields
         static const v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E1
           type: E1
           firstFragment: <testLibraryFragment>::@enum::E1::@field::v1
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E1
           type: List<E1>
           firstFragment: <testLibraryFragment>::@enum::E1::@field::values
           getter: <none>
@@ -6589,27 +6078,22 @@
       getters
         synthetic static get v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E1
           firstFragment: <testLibraryFragment>::@enum::E1::@getter::v1
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E1
           firstFragment: <testLibraryFragment>::@enum::E1::@getter::values
     enum E2
       reference: <testLibraryFragment>::@enum::E2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E2
       supertype: Enum
       fields
         static const v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E2
           type: E2
           firstFragment: <testLibraryFragment>::@enum::E2::@field::v2
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E2
           type: List<E2>
           firstFragment: <testLibraryFragment>::@enum::E2::@field::values
           getter: <none>
@@ -6620,11 +6104,9 @@
       getters
         synthetic static get v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E2
           firstFragment: <testLibraryFragment>::@enum::E2::@getter::v2
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E2
           firstFragment: <testLibraryFragment>::@enum::E2::@getter::values
 ''');
   }
@@ -6833,43 +6315,35 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::M::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::M
         class A @36
           reference: <testLibraryFragment>::@class::A
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @52
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @70
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             foo @92
               reference: <testLibraryFragment>::@class::B::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @110
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             foo @141
               reference: <testLibraryFragment>::@class::C::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @159
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -6883,41 +6357,31 @@
           fields
             enumConstant a @8
               reference: <testLibraryFragment>::@enum::E::@field::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::a
             enumConstant b @11
               reference: <testLibraryFragment>::@enum::E::@field::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::b
             enumConstant c @14
               reference: <testLibraryFragment>::@enum::E::@field::c
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::c
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get a @-1
               reference: <testLibraryFragment>::@enum::E::@getter::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get b @-1
               reference: <testLibraryFragment>::@enum::E::@getter::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get c @-1
               reference: <testLibraryFragment>::@enum::E::@getter::c
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   classes
     class M
       reference: <testLibraryFragment>::@class::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::M
       constructors
         synthetic new
@@ -6925,7 +6389,6 @@
           firstFragment: <testLibraryFragment>::@class::M::@constructor::new
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -6937,7 +6400,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -6949,7 +6411,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::foo
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: Object
       constructors
@@ -6962,7 +6423,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
     class alias D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       supertype: Object
       constructors
@@ -6972,31 +6432,26 @@
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::a
           getter: <none>
         static const b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::b
           getter: <none>
         static const c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::c
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -7007,19 +6462,15 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::b
         synthetic static get c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::c
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -7117,48 +6568,38 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -7169,23 +6610,19 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -7373,62 +6810,48 @@
           fields
             value @26
               reference: <testLibraryFragment>::@class::A::@field::value
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::value
           constructors
             const new @41
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get value @-1
               reference: <testLibraryFragment>::@class::A::@getter::value
-              enclosingFragment: <testLibraryFragment>::@class::A
       enums
         enum E @64
           reference: <testLibraryFragment>::@enum::E
           fields
             enumConstant a @78
               reference: <testLibraryFragment>::@enum::E::@field::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::a
             enumConstant b @83
               reference: <testLibraryFragment>::@enum::E::@field::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::b
             enumConstant c @96
               reference: <testLibraryFragment>::@enum::E::@field::c
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::c
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get a @-1
               reference: <testLibraryFragment>::@enum::E::@getter::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get b @-1
               reference: <testLibraryFragment>::@enum::E::@getter::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get c @-1
               reference: <testLibraryFragment>::@enum::E::@getter::c
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final value
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::A::@field::value
           getter: <none>
@@ -7443,36 +6866,30 @@
       getters
         synthetic get value
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::value
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::a
           getter: <none>
         static const b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::b
           getter: <none>
         static const c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::c
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -7483,19 +6900,15 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::b
         synthetic static get c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::c
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -7583,39 +6996,31 @@
           fields
             enumConstant v @16
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -7626,11 +7031,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -7735,16 +7138,13 @@
           fields
             enumConstant v @25
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             const new @41
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
               metadata
                 Annotation
                   atSign: @ @30
@@ -7756,35 +7156,28 @@
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -7803,23 +7196,19 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -7929,27 +7318,21 @@
           fields
             enumConstant v @25
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
           methods
             foo @40
               reference: <testLibraryFragment>::@enum::E::@method::foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
               metadata
                 Annotation
                   atSign: @ @30
@@ -7961,28 +7344,23 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -7993,11 +7371,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
       methods
         foo
@@ -8014,14 +7390,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -8178,34 +7552,26 @@
           fields
             enumConstant v @40
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
             foo @58
               reference: <testLibraryFragment>::@enum::E::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get foo @-1
               reference: <testLibraryFragment>::@enum::E::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::E
           methods
             bar @81
               reference: <testLibraryFragment>::@enum::E::@method::bar
-              enclosingFragment: <testLibraryFragment>::@enum::E
               metadata
                 Annotation
                   atSign: @ @69
@@ -8217,16 +7583,13 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -8242,19 +7605,16 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E<dynamic>
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
         static const foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: int
           firstFragment: <testLibraryFragment>::@enum::E::@field::foo
           getter: <none>
@@ -8265,15 +7625,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::foo
       methods
         bar
@@ -8290,14 +7647,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -8415,36 +7770,28 @@
           fields
             enumConstant v @31
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -8460,13 +7807,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E<dynamic>
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -8477,23 +7822,19 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -8591,48 +7932,38 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -8643,23 +7974,19 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -8775,50 +8102,40 @@
           fields
             enumConstant v @33
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@field::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::v
             values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@field::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           getters
             get v @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
             get values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           methods
             foo @43
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
         enum A @68
           reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
           previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           methods
             bar @80
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           type: A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           type: List<A>
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@field::values
           getter: <none>
@@ -8829,11 +8146,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::values
       methods
         foo
@@ -9044,23 +8359,18 @@
           fields
             enumConstant v @43
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a1.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/a11.dart
@@ -9110,19 +8420,16 @@
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -9133,11 +8440,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
   exportedReferences
     declared <testLibraryFragment>::@enum::A
@@ -9280,64 +8585,51 @@
           fields
             values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@field::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0
           getters
             get values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@getter::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0
           methods
             foo1 @47
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0
         enum A @65
           reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::1
           fields
             enumConstant v @71
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@field::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::v
             values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@field::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           getters
             get v @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
             get values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           methods
             foo2 @81
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@method::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
         enum A @107
           reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::1
           previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           methods
             foo3 @119
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::1::@method::foo3
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::1
   enums
     enum A
       reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0
       supertype: Enum
       fields
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0
           type: List<A>
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@field::values
           getter: <none>
@@ -9348,7 +8640,6 @@
       getters
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@getter::values
       methods
         foo1
@@ -9356,19 +8647,16 @@
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@method::foo1
     enum A
       reference: <testLibrary>::@fragment::package:test/a.dart::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           type: A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           type: List<A>
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@field::values
           getter: <none>
@@ -9379,11 +8667,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::A::@getter::values
       methods
         foo2
@@ -9507,20 +8793,16 @@
           fields
             values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
           getters
             get values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
           methods
             foo1 @61
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       enums
@@ -9530,17 +8812,14 @@
           methods
             foo2 @43
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@method::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
       supertype: Enum
       fields
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
           type: List<A>
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::values
           getter: <none>
@@ -9551,7 +8830,6 @@
       getters
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::values
       methods
         foo1
@@ -9719,23 +8997,18 @@
           fields
             enumConstant v1 @26
               reference: <testLibraryFragment>::@enum::A::@field::v1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v1
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v1 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v1
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -9745,34 +9018,28 @@
           fields
             enumConstant v2 @40
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::v2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::v2
           getters
             get v2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::v2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v1
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         static const v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::v2
           getter: <none>
@@ -9783,15 +9050,12 @@
       getters
         synthetic static get v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v1
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic static get v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::v2
 ''');
   }
@@ -10009,23 +9273,18 @@
           fields
             enumConstant v1 @41
               reference: <testLibraryFragment>::@enum::A::@field::v1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v1
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v1 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v1
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -10037,12 +9296,10 @@
           fields
             enumConstant v2 @40
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::v2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::v2
           getters
             get v2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::v2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       enums
@@ -10052,40 +9309,33 @@
           fields
             enumConstant v3 @40
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@field::v3
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@getter::v3
           getters
             get v3 @-1
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@getter::v3
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v1
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         static const v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::v2
           getter: <none>
         static const v3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@field::v3
           getter: <none>
@@ -10096,19 +9346,15 @@
       getters
         synthetic static get v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v1
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic static get v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::v2
         synthetic static get v3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@getter::v3
 ''');
   }
@@ -10290,23 +9536,18 @@
           fields
             enumConstant v1 @26
               reference: <testLibraryFragment>::@enum::A::@field::v1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v1
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v1 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v1
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -10316,39 +9557,32 @@
           fields
             enumConstant v2 @40
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::v2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::v2
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::v2
             enumConstant v2 @54
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::v2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::v2
           getters
             get v2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::v2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v1
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         static const v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::v2
           getter: <none>
@@ -10359,15 +9593,12 @@
       getters
         synthetic static get v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v1
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic static get v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::v2
 ''');
   }
@@ -10579,38 +9810,29 @@
           fields
             enumConstant v1 @26
               reference: <testLibraryFragment>::@enum::A::@field::v1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v1
             enumConstant v2 @30
               reference: <testLibraryFragment>::@enum::A::@field::v2
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::v2
               getter2: <testLibraryFragment>::@enum::A::@getter::v2
             enumConstant v3 @34
               reference: <testLibraryFragment>::@enum::A::@field::v3
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v3
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v1 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v1
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get v2 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v2
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get v3 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v3
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -10620,36 +9842,30 @@
           fields
             enumConstant v2 @48
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::v2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@field::v2
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v1
           getter: <none>
         static const v3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v3
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         static const v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v2
           getter: <none>
@@ -10660,19 +9876,15 @@
       getters
         synthetic static get v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v1
         synthetic static get v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v2
         synthetic static get v3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v3
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -10868,31 +10080,24 @@
           fields
             enumConstant v1 @26
               reference: <testLibraryFragment>::@enum::A::@field::v1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::v1
               getter2: <testLibraryFragment>::@enum::A::@getter::v1
             enumConstant v2 @33
               reference: <testLibraryFragment>::@enum::A::@field::v2
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v2
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             const new @48
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v1 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v1
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get v2 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v2
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -10902,30 +10107,25 @@
           fields
             enumConstant v1 @48
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::v1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@field::v1
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v2
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         static const v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v1
           getter: <none>
@@ -10940,15 +10140,12 @@
       getters
         synthetic static get v1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v1
         synthetic static get v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v2
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -11068,27 +10265,21 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::v
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             enumConstant v2 @29
               reference: <testLibraryFragment>::@enum::A::@field::v2
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v2
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get v2 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v2
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -11100,45 +10291,37 @@
           fields
             enumConstant v @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@field::v
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v2
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get v2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v2
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -11237,19 +10420,15 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -11259,25 +10438,21 @@
           constructors
             const named @49
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               periodOffset: 48
               nameEnd: 54
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -11288,11 +10463,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -11404,19 +10577,15 @@
           fields
             enumConstant v @30
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -11428,13 +10597,11 @@
           constructors
             const named @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               periodOffset: 52
               nameEnd: 58
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@enum::A
@@ -11442,13 +10609,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A<int>
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -11463,11 +10628,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -11572,23 +10735,18 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             const new @37
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -11598,25 +10756,21 @@
           constructors
             const named @49
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               periodOffset: 48
               nameEnd: 54
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -11630,11 +10784,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -11731,19 +10883,15 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -11753,23 +10901,19 @@
           constructors
             const new @47
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -11780,11 +10924,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -11889,25 +11031,20 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             const named @39
               reference: <testLibraryFragment>::@enum::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@enum::A
               periodOffset: 38
               nameEnd: 44
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -11917,23 +11054,19 @@
           constructors
             const new @47
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -11947,11 +11080,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -12065,26 +11196,20 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             f @44
               reference: <testLibraryFragment>::@enum::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::f
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get f @-1
               reference: <testLibraryFragment>::@enum::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -12094,31 +11219,26 @@
           constructors
             const named @49
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               periodOffset: 48
               nameEnd: 54
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::f
           getter: <none>
@@ -12133,15 +11253,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::f
 ''');
   }
@@ -12261,26 +11378,20 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             f @41
               reference: <testLibraryFragment>::@enum::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::f
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get f @-1
               reference: <testLibraryFragment>::@enum::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -12290,7 +11401,6 @@
           constructors
             const named @49
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               periodOffset: 48
               nameEnd: 54
               constantInitializers
@@ -12306,25 +11416,21 @@
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::f
           getter: <none>
@@ -12335,15 +11441,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::f
 ''');
   }
@@ -12475,31 +11578,24 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @41
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -12509,30 +11605,25 @@
           fields
             foo @59
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@field::foo
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -12543,15 +11634,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
 ''');
   }
@@ -12715,31 +11803,24 @@
           fields
             enumConstant v @41
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @56
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -12751,7 +11832,6 @@
           fields
             foo @59
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@field::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@fieldAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -12763,30 +11843,25 @@
           fields
             foo @59
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -12797,15 +11872,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
 ''');
   }
@@ -12969,31 +12041,24 @@
           fields
             enumConstant v @41
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @56
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -13006,7 +12071,6 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@getter::foo
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
@@ -13017,30 +12081,25 @@
           fields
             foo @59
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@field::foo
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -13051,15 +12110,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
 ''');
   }
@@ -13226,31 +12282,24 @@
           fields
             enumConstant v @41
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @56
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -13262,7 +12311,6 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               parameters
                 _ @61
     <testLibrary>::@fragment::package:test/b.dart
@@ -13274,30 +12322,25 @@
           fields
             foo @59
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@field::foo
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -13308,20 +12351,16 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           parameters
             requiredPositional _
               reference: <none>
@@ -13457,31 +12496,24 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @41
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -13491,30 +12523,25 @@
           fields
             foo @62
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@field::foo
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -13525,15 +12552,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
 ''');
   }
@@ -13685,31 +12709,24 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @52
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -13719,30 +12736,25 @@
           fields
             foo @70
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@field::foo
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int Function()
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -13753,15 +12765,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
 ''');
   }
@@ -13894,31 +12903,24 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @-1
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @39
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -13928,30 +12930,25 @@
           fields
             foo @59
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@field::foo
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -13962,15 +12959,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
 ''');
   }
@@ -14110,30 +13104,23 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo1 @41
               reference: <testLibraryFragment>::@enum::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo1
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo1 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -14143,40 +13130,33 @@
           fields
             foo2 @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
           getters
             get foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo1
           getter: <none>
         final foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo2
           getter: <none>
@@ -14187,19 +13167,15 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo1
         synthetic get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
 ''');
   }
@@ -14349,30 +13325,23 @@
           fields
             enumConstant v @30
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo1 @51
               reference: <testLibraryFragment>::@enum::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo1
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo1 @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -14384,16 +13353,13 @@
           fields
             foo2 @54
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
           getters
             get foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@enum::A
@@ -14401,25 +13367,21 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A<int>
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: T1
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo1
           getter: <none>
         final foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: T2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo2
           getter: <none>
@@ -14430,19 +13392,15 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo1
         synthetic get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
 ''');
   }
@@ -14556,23 +13514,18 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             const new @40
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -14582,34 +13535,28 @@
           fields
             foo @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo
           getter: <none>
@@ -14624,15 +13571,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo
 ''');
   }
@@ -14752,16 +13696,13 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             const new @37
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
               constantInitializers
                 ConstructorFieldInitializer
                   fieldName: SimpleIdentifier
@@ -14775,10 +13716,8 @@
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -14788,34 +13727,28 @@
           fields
             foo @51
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo
           getter: <none>
@@ -14826,15 +13759,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo
 ''');
   }
@@ -14972,30 +13902,23 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo1 @-1
               reference: <testLibraryFragment>::@enum::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo1
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo1 @39
               reference: <testLibraryFragment>::@enum::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -15005,40 +13928,33 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
           getters
             get foo2 @49
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo2
           getter: <none>
@@ -15049,19 +13965,15 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo1
         get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
 ''');
   }
@@ -15211,30 +14123,23 @@
           fields
             enumConstant v @30
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo1 @-1
               reference: <testLibraryFragment>::@enum::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo1
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo1 @49
               reference: <testLibraryFragment>::@enum::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -15246,16 +14151,13 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
           getters
             get foo2 @52
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@enum::A
@@ -15263,25 +14165,21 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A<int>
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: T1
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: T2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo2
           getter: <none>
@@ -15292,19 +14190,15 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         abstract get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo1
         abstract get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getter::foo2
 ''');
   }
@@ -15436,30 +14330,23 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @41
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -15470,30 +14357,25 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@getter::foo
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -15504,15 +14386,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
 ''');
   }
@@ -15676,30 +14555,23 @@
           fields
             enumConstant v @41
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @56
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -15712,7 +14584,6 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -15724,30 +14595,25 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -15758,15 +14624,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
 ''');
   }
@@ -15912,38 +14775,29 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo1 @-1
               reference: <testLibraryFragment>::@enum::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo1
             foo2 @-1
               reference: <testLibraryFragment>::@enum::A::@field::foo2
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo2
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo1 @39
               reference: <testLibraryFragment>::@enum::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo1
             get foo2 @60
               reference: <testLibraryFragment>::@enum::A::@getter::foo2
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -15953,36 +14807,30 @@
           getters
             augment get foo1 @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@getter::foo1
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo2
           getter: <none>
@@ -15993,19 +14841,15 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo2
         get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo1
 ''');
   }
@@ -16145,30 +14989,23 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @-1
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @39
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo::@def::0
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -16179,35 +15016,29 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo::@def::0
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo::@def::1
             augment get foo @85
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo::@def::1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo::@def::0
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -16218,15 +15049,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
 ''');
   }
@@ -16389,30 +15217,23 @@
           fields
             enumConstant v @41
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @-1
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @54
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -16425,7 +15246,6 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -16437,30 +15257,25 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -16471,15 +15286,12 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
 ''');
   }
@@ -16589,19 +15401,15 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -16611,38 +15419,31 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@getterAugmentation::foo
 ''');
   }
@@ -16761,7 +15562,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
       enums
         enum A @20
           reference: <testLibraryFragment>::@enum::A
@@ -16769,23 +15569,18 @@
           fields
             enumConstant v @40
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -16794,7 +15589,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       enums
         enum A @34
           reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
@@ -16802,7 +15596,6 @@
   classes
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -16810,7 +15603,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       constructors
         synthetic new
@@ -16819,19 +15611,16 @@
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -16842,11 +15631,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -16998,7 +15785,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
       enums
         enum A @20
           reference: <testLibraryFragment>::@enum::A
@@ -17006,23 +15792,18 @@
           fields
             enumConstant v @40
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -17032,7 +15813,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       enums
         enum A @49
           reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
@@ -17046,7 +15826,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/b.dart::@class::I3::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@class::I3
       enums
         enum A @31
           reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
@@ -17054,7 +15833,6 @@
   classes
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -17062,7 +15840,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       constructors
         synthetic new
@@ -17070,7 +15847,6 @@
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
     class I3
       reference: <testLibrary>::@fragment::package:test/b.dart::@class::I3
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@class::I3
       constructors
         synthetic new
@@ -17079,19 +15855,16 @@
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -17102,11 +15875,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -17234,7 +16005,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
       enums
         enum A @20
           reference: <testLibraryFragment>::@enum::A
@@ -17244,23 +16014,18 @@
           fields
             enumConstant v @43
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -17271,7 +16036,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       enums
         enum A @34
           reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
@@ -17281,7 +16045,6 @@
   classes
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -17289,7 +16052,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
@@ -17300,7 +16062,6 @@
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::A
@@ -17308,13 +16069,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A<int>
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -17325,11 +16084,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -17458,7 +16215,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
       enums
         enum A @20
           reference: <testLibraryFragment>::@enum::A
@@ -17468,23 +16224,18 @@
           fields
             enumConstant v @43
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -17495,7 +16246,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       enums
         enum A @34
           reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
@@ -17506,7 +16256,6 @@
   classes
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -17514,7 +16263,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
@@ -17525,7 +16273,6 @@
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::A
@@ -17533,13 +16280,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A<dynamic>
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -17550,11 +16295,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -17665,27 +16408,21 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
           methods
             foo @36
               reference: <testLibraryFragment>::@enum::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -17695,23 +16432,19 @@
           methods
             bar @46
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -17722,11 +16455,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       methods
         foo
@@ -17865,23 +16596,18 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -17891,25 +16617,21 @@
           methods
             foo @46
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               parameters
                 default x @55
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -17920,11 +16642,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       methods
         foo
@@ -18050,31 +16770,24 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
           methods
             foo1 @36
               reference: <testLibraryFragment>::@enum::A::@method::foo1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
             foo2 @53
               reference: <testLibraryFragment>::@enum::A::@method::foo2
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -18085,23 +16798,19 @@
             augment foo1 @54
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo1
               previousFragment: <testLibraryFragment>::@enum::A::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -18112,11 +16821,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       methods
         foo2
@@ -18242,28 +16949,22 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
           methods
             foo @36
               reference: <testLibraryFragment>::@enum::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo::@def::0
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -18275,27 +16976,22 @@
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo::@def::0
               previousFragment: <testLibraryFragment>::@enum::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo::@def::1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
             augment foo @78
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo::@def::1
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo::@def::0
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -18306,11 +17002,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       methods
         foo
@@ -18441,28 +17135,22 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
           methods
             foo @36
               reference: <testLibraryFragment>::@enum::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -18475,7 +17163,6 @@
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@enum::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::1::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0
         enum A @78
           reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::1
           previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0
@@ -18483,23 +17170,19 @@
             augment foo @98
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::1::@methodAugmentation::foo
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::0::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@def::1
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -18510,11 +17193,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       methods
         foo
@@ -18660,28 +17341,22 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
           methods
             foo @36
               reference: <testLibraryFragment>::@enum::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -18695,7 +17370,6 @@
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@enum::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       enums
@@ -18706,23 +17380,19 @@
             augment foo @51
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -18733,11 +17403,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       methods
         foo
@@ -18862,27 +17530,21 @@
           fields
             enumConstant v @29
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
           methods
             foo @43
               reference: <testLibraryFragment>::@enum::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -18894,11 +17556,9 @@
           methods
             bar @48
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::A
@@ -18906,13 +17566,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A<int>
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -18923,11 +17581,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       methods
         foo
@@ -19056,28 +17712,22 @@
           fields
             enumConstant v @29
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
           methods
             foo @43
               reference: <testLibraryFragment>::@enum::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -19090,11 +17740,9 @@
             augment foo @56
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@enum::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@enum::A
@@ -19102,13 +17750,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A<int>
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -19119,11 +17765,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       methods
         foo
@@ -19243,23 +17887,18 @@
           fields
             enumConstant v @34
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
       mixins
         mixin M1 @44
           reference: <testLibraryFragment>::@mixin::M1
@@ -19275,19 +17914,16 @@
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -19298,22 +17934,18 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
   mixins
     mixin M1
       reference: <testLibraryFragment>::@mixin::M1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M1
       superclassConstraints
         Object
     mixin M2
       reference: <testLibrary>::@fragment::package:test/a.dart::@mixin::M2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixin::M2
       superclassConstraints
         Object
@@ -19482,23 +18114,18 @@
           fields
             enumConstant v @57
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
       mixins
         mixin M1 @74
           reference: <testLibraryFragment>::@mixin::M1
@@ -19535,7 +18162,6 @@
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@enum::A
@@ -19543,13 +18169,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A<int>
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A<dynamic>>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -19560,16 +18184,13 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
   mixins
     mixin M1
       reference: <testLibraryFragment>::@mixin::M1
-      enclosingElement2: <testLibrary>
       typeParameters
         U1
       firstFragment: <testLibraryFragment>::@mixin::M1
@@ -19577,7 +18198,6 @@
         Object
     mixin M2
       reference: <testLibrary>::@fragment::package:test/a.dart::@mixin::M2
-      enclosingElement2: <testLibrary>
       typeParameters
         U2
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixin::M2
@@ -19585,7 +18205,6 @@
         M1<U2>
     mixin M3
       reference: <testLibrary>::@fragment::package:test/b.dart::@mixin::M3
-      enclosingElement2: <testLibrary>
       typeParameters
         U3
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@mixin::M3
@@ -19733,31 +18352,24 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo1 @-1
               reference: <testLibraryFragment>::@enum::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               setter2: <testLibraryFragment>::@enum::A::@setter::foo1
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
           setters
             set foo1= @35
               reference: <testLibraryFragment>::@enum::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               parameters
                 _ @44
     <testLibrary>::@fragment::package:test/a.dart
@@ -19769,42 +18381,35 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               setter2: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@setter::foo2
           setters
             set foo2= @45
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               parameters
                 _ @54
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo1
           setter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@field::foo2
           setter: <none>
@@ -19815,16 +18420,13 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       setters
         set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           parameters
             requiredPositional _
               reference: <none>
@@ -19832,7 +18434,6 @@
           firstFragment: <testLibraryFragment>::@enum::A::@setter::foo1
         set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           parameters
             requiredPositional _
               reference: <none>
@@ -19971,30 +18572,23 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo @41
               reference: <testLibraryFragment>::@enum::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::foo
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get foo @-1
               reference: <testLibraryFragment>::@enum::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -20004,31 +18598,26 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               parameters
                 _ @61
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo
           getter: <none>
@@ -20039,20 +18628,16 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::foo
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           parameters
             requiredPositional _
               reference: <none>
@@ -20174,23 +18759,18 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -20200,25 +18780,21 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               parameters
                 _ @61
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -20229,16 +18805,13 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           parameters
             requiredPositional _
               reference: <none>
@@ -20397,41 +18970,32 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
             foo1 @-1
               reference: <testLibraryFragment>::@enum::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               setter2: <testLibraryFragment>::@enum::A::@setter::foo1
             foo2 @-1
               reference: <testLibraryFragment>::@enum::A::@field::foo2
-              enclosingFragment: <testLibraryFragment>::@enum::A
               setter2: <testLibraryFragment>::@enum::A::@setter::foo2
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
           setters
             set foo1= @35
               reference: <testLibraryFragment>::@enum::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@enum::A
               parameters
                 _ @44
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@setterAugmentation::foo1
             set foo2= @56
               reference: <testLibraryFragment>::@enum::A::@setter::foo2
-              enclosingFragment: <testLibraryFragment>::@enum::A
               parameters
                 _ @65
     <testLibrary>::@fragment::package:test/a.dart
@@ -20443,38 +19007,32 @@
           setters
             augment set foo1= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@setterAugmentation::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               parameters
                 _ @62
               previousFragment: <testLibraryFragment>::@enum::A::@setter::foo1
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo1
           setter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: int
           firstFragment: <testLibraryFragment>::@enum::A::@field::foo2
           setter: <none>
@@ -20485,16 +19043,13 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
       setters
         set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           parameters
             requiredPositional _
               reference: <none>
@@ -20502,7 +19057,6 @@
           firstFragment: <testLibraryFragment>::@enum::A::@setter::foo2
         set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           parameters
             requiredPositional _
               reference: <none>
@@ -20607,19 +19161,15 @@
           fields
             enumConstant v @39
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -20634,39 +19184,32 @@
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
     class A
       reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -20778,19 +19321,15 @@
           fields
             enumConstant v @39
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -20806,35 +19345,29 @@
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -20973,26 +19506,21 @@
           fields
             enumConstant v @41
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             const named @62
               reference: <testLibraryFragment>::@enum::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@enum::A
               periodOffset: 61
               nameEnd: 67
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructorAugmentation::named
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -21004,7 +19532,6 @@
           constructors
             augment const named @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructorAugmentation::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               periodOffset: 56
               nameEnd: 62
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@constructorAugmentation::named
@@ -21018,26 +19545,22 @@
           constructors
             augment const named @57
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A::@constructorAugmentation::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::A
               periodOffset: 56
               nameEnd: 62
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructorAugmentation::named
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -21048,11 +19571,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -21186,26 +19707,21 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             const named @47
               reference: <testLibraryFragment>::@enum::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@enum::A
               periodOffset: 46
               nameEnd: 52
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructorAugmentation::named
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -21215,26 +19731,22 @@
           constructors
             augment const named @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructorAugmentation::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               periodOffset: 56
               nameEnd: 62
               previousFragment: <testLibraryFragment>::@enum::A::@constructor::named
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -21245,11 +19757,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -21374,24 +19884,19 @@
           fields
             enumConstant v @26
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             const new @37
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructorAugmentation::new
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -21401,24 +19906,20 @@
           constructors
             augment const new @55
               reference: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A::@constructorAugmentation::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enumAugmentation::A
               previousFragment: <testLibraryFragment>::@enum::A::@constructor::new
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::A
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -21429,11 +19930,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
@@ -21562,23 +20061,18 @@
           fields
             enumConstant v @57
               reference: <testLibraryFragment>::@enum::B::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::B
               getter2: <testLibraryFragment>::@enum::B::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::B::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::B
               getter2: <testLibraryFragment>::@enum::B::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::B
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::B::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::B
             get values @-1
               reference: <testLibraryFragment>::@enum::B::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::B
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -21588,25 +20082,21 @@
           methods
             foo @41
               reference: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::B::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@enumAugmentation::B
               parameters
                 a @45
   enums
     enum B
       reference: <testLibraryFragment>::@enum::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::B
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           type: B
           firstFragment: <testLibraryFragment>::@enum::B::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           type: List<B>
           firstFragment: <testLibraryFragment>::@enum::B::@field::values
           getter: <none>
@@ -21617,11 +20107,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           firstFragment: <testLibraryFragment>::@enum::B::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           firstFragment: <testLibraryFragment>::@enum::B::@getter::values
       methods
         foo
@@ -21751,27 +20239,21 @@
           fields
             enumConstant v @27
               reference: <testLibraryFragment>::@enum::B::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::B
               getter2: <testLibraryFragment>::@enum::B::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::B::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::B
               getter2: <testLibraryFragment>::@enum::B::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::B
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::B::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::B
             get values @-1
               reference: <testLibraryFragment>::@enum::B::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::B
           methods
             foo @32
               reference: <testLibraryFragment>::@enum::B::@method::foo
-              enclosingFragment: <testLibraryFragment>::@enum::B
               parameters
                 a @36
     <testLibrary>::@fragment::package:test/b.dart
@@ -21785,19 +20267,16 @@
   enums
     enum B
       reference: <testLibraryFragment>::@enum::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::B
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           type: B
           firstFragment: <testLibraryFragment>::@enum::B::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           type: List<B>
           firstFragment: <testLibraryFragment>::@enum::B::@field::values
           getter: <none>
@@ -21808,11 +20287,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           firstFragment: <testLibraryFragment>::@enum::B::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           firstFragment: <testLibraryFragment>::@enum::B::@getter::values
       methods
         foo
@@ -21942,27 +20419,21 @@
           fields
             enumConstant v @27
               reference: <testLibraryFragment>::@enum::B::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::B
               getter2: <testLibraryFragment>::@enum::B::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::B::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::B
               getter2: <testLibraryFragment>::@enum::B::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::B
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::B::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::B
             get values @-1
               reference: <testLibraryFragment>::@enum::B::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::B
           methods
             foo @32
               reference: <testLibraryFragment>::@enum::B::@method::foo
-              enclosingFragment: <testLibraryFragment>::@enum::B
               parameters
                 a @36
     <testLibrary>::@fragment::package:test/b.dart
@@ -21976,19 +20447,16 @@
   enums
     enum B
       reference: <testLibraryFragment>::@enum::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::B
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           type: B
           firstFragment: <testLibraryFragment>::@enum::B::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           type: List<B>
           firstFragment: <testLibraryFragment>::@enum::B::@field::values
           getter: <none>
@@ -21999,11 +20467,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           firstFragment: <testLibraryFragment>::@enum::B::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           firstFragment: <testLibraryFragment>::@enum::B::@getter::values
       methods
         foo
@@ -22122,7 +20588,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
       enums
         enum A @20
           reference: <testLibraryFragment>::@enum::A
@@ -22132,23 +20597,18 @@
           fields
             enumConstant v @39
               reference: <testLibraryFragment>::@enum::A::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
               getter2: <testLibraryFragment>::@enum::A::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::A
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::A::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::A
             get values @-1
               reference: <testLibraryFragment>::@enum::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       enums
@@ -22160,7 +20620,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -22169,7 +20628,6 @@
   enums
     enum A
       reference: <testLibraryFragment>::@enum::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: B
@@ -22178,13 +20636,11 @@
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: A<B>
           firstFragment: <testLibraryFragment>::@enum::A::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           type: List<A<B>>
           firstFragment: <testLibraryFragment>::@enum::A::@field::values
           getter: <none>
@@ -22195,11 +20651,9 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::A
           firstFragment: <testLibraryFragment>::@enum::A::@getter::values
 ''');
   }
diff --git a/pkg/analyzer/test/src/summary/elements/extension_test.dart b/pkg/analyzer/test/src/summary/elements/extension_test.dart
index 85d7a88..ff7277e 100644
--- a/pkg/analyzer/test/src/summary/elements/extension_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/extension_test.dart
@@ -48,7 +48,6 @@
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       documentationComment: /// aaa\n/// bbbb\n/// cc
       firstFragment: <testLibraryFragment>::@extension::E
 ''');
@@ -97,28 +96,23 @@
           fields
             x @36
               reference: <testLibraryFragment>::@extension::E::@field::x
-              enclosingFragment: <testLibraryFragment>::@extension::E
               getter2: <testLibraryFragment>::@extension::E::@getter::x
           getters
             get x @-1
               reference: <testLibraryFragment>::@extension::E::@getter::x
-              enclosingFragment: <testLibraryFragment>::@extension::E
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E
       fields
         static const x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E
           type: int
           firstFragment: <testLibraryFragment>::@extension::E::@field::x
           getter: <none>
       getters
         synthetic static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E
           firstFragment: <testLibraryFragment>::@extension::E::@getter::x
 ''');
   }
@@ -156,7 +150,6 @@
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: num
@@ -196,7 +189,6 @@
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@extension::E
@@ -309,16 +301,13 @@
           fields
             foo @65
               reference: <testLibraryFragment>::@extension::E::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::E
               getter2: <testLibraryFragment>::@extension::E::@getter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@extension::E::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::E
           methods
             bar @88
               reference: <testLibraryFragment>::@extension::E::@method::bar
-              enclosingFragment: <testLibraryFragment>::@extension::E
               metadata
                 Annotation
                   atSign: @ @76
@@ -330,16 +319,13 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -354,14 +340,12 @@
       fields
         static const foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E
           type: int
           firstFragment: <testLibraryFragment>::@extension::E::@field::foo
           getter: <none>
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E
           firstFragment: <testLibraryFragment>::@extension::E::@getter::foo
       methods
         bar
@@ -378,14 +362,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -461,23 +443,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       extensions
         extension E @50
           reference: <testLibraryFragment>::@extension::E
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -486,19 +464,16 @@
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -545,28 +520,23 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@extension::E::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::E
               getter2: <testLibraryFragment>::@extension::E::@getter::foo
           getters
             get foo @31
               reference: <testLibraryFragment>::@extension::E::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::E
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E
           type: int
           firstFragment: <testLibraryFragment>::@extension::E::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E
           firstFragment: <testLibraryFragment>::@extension::E::@getter::foo
 ''');
   }
@@ -617,30 +587,25 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@extension::E::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::E
               setter2: <testLibraryFragment>::@extension::E::@setter::foo
           setters
             set foo= @27
               reference: <testLibraryFragment>::@extension::E::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::E
               parameters
                 value @35
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E
           type: int
           firstFragment: <testLibraryFragment>::@extension::E::@field::foo
           setter: <none>
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E
           parameters
             requiredPositional value
               reference: <none>
@@ -745,7 +710,6 @@
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
   exportedReferences
     declared <testLibraryFragment>::@extension::A
@@ -842,7 +806,6 @@
           methods
             foo1 @65
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       extensions
@@ -852,11 +815,9 @@
           methods
             foo2 @47
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@method::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A
   extensions
     extension A
       reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
       methods
         foo1
@@ -966,18 +927,15 @@
           fields
             foo @49
               reference: <testLibraryFragment>::@extension::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extension::A::@getter::foo
               setter2: <testLibraryFragment>::@extension::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@extension::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extension::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -989,17 +947,14 @@
           fields
             foo @64
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@field::foo
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo
           getter: <none>
@@ -1007,12 +962,10 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -1151,18 +1104,15 @@
           fields
             foo @64
               reference: <testLibraryFragment>::@extension::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extension::A::@getter::foo
               setter2: <testLibraryFragment>::@extension::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@extension::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extension::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -1176,7 +1126,6 @@
           fields
             foo @64
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@field::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@fieldAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -1188,17 +1137,14 @@
           fields
             foo @64
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@fieldAugmentation::foo
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo
           getter: <none>
@@ -1206,12 +1152,10 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -1350,19 +1294,16 @@
           fields
             foo @64
               reference: <testLibraryFragment>::@extension::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extension::A::@getter::foo
               setter2: <testLibraryFragment>::@extension::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@extension::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extension::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -1376,7 +1317,6 @@
           getters
             augment get foo @68
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@getter::foo
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
@@ -1387,17 +1327,14 @@
           fields
             foo @64
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@field::foo
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo
           getter: <none>
@@ -1405,12 +1342,10 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -1552,18 +1487,15 @@
           fields
             foo @64
               reference: <testLibraryFragment>::@extension::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extension::A::@getter::foo
               setter2: <testLibraryFragment>::@extension::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@extension::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extension::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _foo @-1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@setterAugmentation::foo
@@ -1578,7 +1510,6 @@
           setters
             augment set foo= @64
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               parameters
                 _ @72
               previousFragment: <testLibraryFragment>::@extension::A::@setter::foo
@@ -1591,17 +1522,14 @@
           fields
             foo @64
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@field::foo
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo
           getter: <none>
@@ -1609,12 +1537,10 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -1721,18 +1647,15 @@
           fields
             foo @49
               reference: <testLibraryFragment>::@extension::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extension::A::@getter::foo
               setter2: <testLibraryFragment>::@extension::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@extension::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extension::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -1744,17 +1667,14 @@
           fields
             foo @67
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@field::foo
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo
           getter: <none>
@@ -1762,12 +1682,10 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -1864,13 +1782,11 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@extension::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extension::A::@getter::foo
           getters
             get foo @53
               reference: <testLibraryFragment>::@extension::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensions
@@ -1880,24 +1796,20 @@
           fields
             foo @64
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@field::foo
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         synthetic static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo
           getter: <none>
       getters
         static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo
 ''');
   }
@@ -2019,17 +1931,14 @@
           fields
             foo1 @49
               reference: <testLibraryFragment>::@extension::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
               getter2: <testLibraryFragment>::@extension::A::@getter::foo1
               setter2: <testLibraryFragment>::@extension::A::@setter::foo1
           getters
             get foo1 @-1
               reference: <testLibraryFragment>::@extension::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
           setters
             set foo1= @-1
               reference: <testLibraryFragment>::@extension::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _foo1 @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -2041,35 +1950,29 @@
           fields
             foo2 @56
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getter::foo2
               setter2: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@setter::foo2
           getters
             get foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
           setters
             set foo2= @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               parameters
                 _foo2 @-1
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         static foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo1
           getter: <none>
           setter: <none>
         static foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@field::foo2
           getter: <none>
@@ -2077,16 +1980,13 @@
       getters
         synthetic static get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo1
         synthetic static get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getter::foo2
       setters
         synthetic static set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _foo1
               reference: <none>
@@ -2094,7 +1994,6 @@
           firstFragment: <testLibraryFragment>::@extension::A::@setter::foo1
         synthetic static set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _foo2
               reference: <none>
@@ -2196,12 +2095,10 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@extension::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
               getter2: <testLibraryFragment>::@extension::A::@getter::foo1
           getters
             get foo1 @46
               reference: <testLibraryFragment>::@extension::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensions
@@ -2211,38 +2108,31 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getter::foo2
           getters
             get foo2 @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@field::foo2
           getter: <none>
       getters
         get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo1
         get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getter::foo2
 ''');
   }
@@ -2352,12 +2242,10 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@extension::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
               getter2: <testLibraryFragment>::@extension::A::@getter::foo1
           getters
             get foo1 @49
               reference: <testLibraryFragment>::@extension::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensions
@@ -2369,40 +2257,33 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getter::foo2
           getters
             get foo2 @56
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: T1
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: T2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@field::foo2
           getter: <none>
       getters
         abstract get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo1
         abstract get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getter::foo2
 ''');
   }
@@ -2505,18 +2386,15 @@
           fields
             foo @49
               reference: <testLibraryFragment>::@extension::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               getter2: <testLibraryFragment>::@extension::A::@getter::foo
               setter2: <testLibraryFragment>::@extension::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@extension::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extension::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -2528,17 +2406,14 @@
           getters
             augment get foo @68
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@getter::foo
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo
           getter: <none>
@@ -2546,12 +2421,10 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -2690,18 +2563,15 @@
           fields
             foo @64
               reference: <testLibraryFragment>::@extension::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               getter2: <testLibraryFragment>::@extension::A::@getter::foo
               setter2: <testLibraryFragment>::@extension::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@extension::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extension::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -2715,7 +2585,6 @@
           getters
             augment get foo @68
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -2727,17 +2596,14 @@
           getters
             augment get foo @68
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo
           getter: <none>
@@ -2745,12 +2611,10 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -2860,20 +2724,16 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@extension::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
               getter2: <testLibraryFragment>::@extension::A::@getter::foo1
             foo2 @-1
               reference: <testLibraryFragment>::@extension::A::@field::foo2
-              enclosingFragment: <testLibraryFragment>::@extension::A
               getter2: <testLibraryFragment>::@extension::A::@getter::foo2
           getters
             get foo1 @46
               reference: <testLibraryFragment>::@extension::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo1
             get foo2 @67
               reference: <testLibraryFragment>::@extension::A::@getter::foo2
-              enclosingFragment: <testLibraryFragment>::@extension::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensions
@@ -2883,34 +2743,28 @@
           getters
             augment get foo1 @61
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@getter::foo1
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo2
           getter: <none>
       getters
         get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo2
         get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo1
 ''');
   }
@@ -3033,12 +2887,10 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@extension::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               getter2: <testLibraryFragment>::@extension::A::@getter::foo
           getters
             get foo @61
               reference: <testLibraryFragment>::@extension::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -3051,7 +2903,6 @@
           getters
             augment get foo @61
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               previousFragment: <testLibraryFragment>::@extension::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -3063,24 +2914,20 @@
           getters
             augment get foo @61
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@getterAugmentation::foo
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo
 ''');
   }
@@ -3156,7 +3003,6 @@
           methods
             foo @43
               reference: <testLibraryFragment>::@extension::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensions
@@ -3166,11 +3012,9 @@
           methods
             bar @50
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       methods
         foo
@@ -3261,10 +3105,8 @@
             foo1 @43
               reference: <testLibraryFragment>::@extension::A::@method::foo1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@methodAugmentation::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
             foo2 @60
               reference: <testLibraryFragment>::@extension::A::@method::foo2
-              enclosingFragment: <testLibraryFragment>::@extension::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensions
@@ -3275,11 +3117,9 @@
             augment foo1 @58
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@methodAugmentation::foo1
               previousFragment: <testLibraryFragment>::@extension::A::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       methods
         foo2
@@ -3394,7 +3234,6 @@
             foo @43
               reference: <testLibraryFragment>::@extension::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -3408,7 +3247,6 @@
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@extension::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       extensions
@@ -3419,11 +3257,9 @@
             augment foo @55
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionAugmentation::A
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       methods
         foo
@@ -3513,7 +3349,6 @@
           methods
             foo @43
               reference: <testLibraryFragment>::@extension::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensions
@@ -3525,11 +3360,9 @@
           methods
             bar @52
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@extension::A
@@ -3626,7 +3459,6 @@
             foo @43
               reference: <testLibraryFragment>::@extension::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensions
@@ -3639,11 +3471,9 @@
             augment foo @60
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@extension::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@extension::A
@@ -3738,10 +3568,8 @@
             foo @43
               reference: <testLibraryFragment>::@extension::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
             bar @59
               reference: <testLibraryFragment>::@extension::A::@method::bar
-              enclosingFragment: <testLibraryFragment>::@extension::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensions
@@ -3754,11 +3582,9 @@
             augment foo @61
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@extension::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       methods
         bar
@@ -3869,12 +3695,10 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@extension::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
               setter2: <testLibraryFragment>::@extension::A::@setter::foo1
           setters
             set foo1= @42
               reference: <testLibraryFragment>::@extension::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _ @51
     <testLibrary>::@fragment::package:test/a.dart
@@ -3886,36 +3710,30 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               setter2: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@setter::foo2
           setters
             set foo2= @49
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               parameters
                 _ @58
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo1
           setter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@field::foo2
           setter: <none>
       setters
         set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _
               reference: <none>
@@ -3923,7 +3741,6 @@
           firstFragment: <testLibraryFragment>::@extension::A::@setter::foo1
         set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _
               reference: <none>
@@ -4033,17 +3850,14 @@
           fields
             foo @49
               reference: <testLibraryFragment>::@extension::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               getter2: <testLibraryFragment>::@extension::A::@getter::foo
               setter2: <testLibraryFragment>::@extension::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@extension::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extension::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _foo @-1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@setterAugmentation::foo
@@ -4056,19 +3870,16 @@
           setters
             augment set foo= @64
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               parameters
                 _ @72
               previousFragment: <testLibraryFragment>::@extension::A::@setter::foo
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo
           getter: <none>
@@ -4076,12 +3887,10 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           firstFragment: <testLibraryFragment>::@extension::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -4200,22 +4009,18 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@extension::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
               setter2: <testLibraryFragment>::@extension::A::@setter::foo1
             foo2 @-1
               reference: <testLibraryFragment>::@extension::A::@field::foo2
-              enclosingFragment: <testLibraryFragment>::@extension::A
               setter2: <testLibraryFragment>::@extension::A::@setter::foo2
           setters
             set foo1= @42
               reference: <testLibraryFragment>::@extension::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _ @51
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@setterAugmentation::foo1
             set foo2= @63
               reference: <testLibraryFragment>::@extension::A::@setter::foo2
-              enclosingFragment: <testLibraryFragment>::@extension::A
               parameters
                 _ @72
     <testLibrary>::@fragment::package:test/a.dart
@@ -4227,32 +4032,27 @@
           setters
             augment set foo1= @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A::@setterAugmentation::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionAugmentation::A
               parameters
                 _ @66
               previousFragment: <testLibraryFragment>::@extension::A::@setter::foo1
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo1
           setter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           type: int
           firstFragment: <testLibraryFragment>::@extension::A::@field::foo2
           setter: <none>
       setters
         set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _
               reference: <none>
@@ -4260,7 +4060,6 @@
           firstFragment: <testLibraryFragment>::@extension::A::@setter::foo2
         set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::A
           parameters
             requiredPositional _
               reference: <none>
@@ -4355,16 +4154,13 @@
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
     class A
       reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
 ''');
   }
@@ -4459,12 +4255,10 @@
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   extensions
     extension A
       reference: <testLibraryFragment>::@extension::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::A
 ''');
   }
diff --git a/pkg/analyzer/test/src/summary/elements/extension_type_test.dart b/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
index c98f069..ba37434 100644
--- a/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
@@ -68,26 +68,21 @@
           fields
             it @27
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             const new @21
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -102,7 +97,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -166,12 +160,10 @@
           fields
             it @27
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             named @17
               reference: <testLibraryFragment>::@extensionType::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               codeOffset: 16
               codeLength: 14
               periodOffset: 16
@@ -179,11 +171,9 @@
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 33
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -191,7 +181,6 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -206,7 +195,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -270,31 +258,25 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @15
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             named @31
               reference: <testLibraryFragment>::@extensionType::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               periodOffset: 30
               nameEnd: 36
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: num
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: num
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -316,7 +298,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -380,31 +361,25 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @15
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             named @31
               reference: <testLibraryFragment>::@extensionType::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               periodOffset: 30
               nameEnd: 36
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: num
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: num
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -426,7 +401,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -500,15 +474,12 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @15
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             const named @37
               reference: <testLibraryFragment>::@extensionType::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               periodOffset: 36
               nameEnd: 42
               constantInitializers
@@ -525,17 +496,14 @@
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: num
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: num
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -557,7 +525,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -619,22 +586,18 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @15
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               codeOffset: 16
               codeLength: 8
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 27
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -642,7 +605,6 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -657,7 +619,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -713,27 +674,22 @@
           fields
             it @30
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @24
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       documentationComment: /// Docs
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -748,7 +704,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -809,46 +764,37 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @46
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static const foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
 ''');
   }
@@ -909,46 +855,37 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @42
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static const foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
 ''');
   }
@@ -1005,46 +942,37 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @35
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
 ''');
   }
@@ -1120,26 +1048,21 @@
           fields
             it @43
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @32
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -1154,7 +1077,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -1210,46 +1132,37 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @37
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
 ''');
   }
@@ -1321,42 +1234,34 @@
           fields
             it @68
               reference: <testLibraryFragment>::@extensionType::X::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::X
               getter2: <testLibraryFragment>::@extensionType::X::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::X::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::X
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
   extensionTypes
     extension type X
       reference: <testLibraryFragment>::@extensionType::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::X
       typeErasure: C
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::X
           type: C
           firstFragment: <testLibraryFragment>::@extensionType::X::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::X
           firstFragment: <testLibraryFragment>::@extensionType::X::@getter::it
 ''');
   }
@@ -1423,57 +1328,47 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type B @56
           reference: <testLibraryFragment>::@extensionType::B
           fields
             it @62
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
 ''');
   }
@@ -1521,29 +1416,24 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -1608,57 +1498,47 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type B @43
           reference: <testLibraryFragment>::@extensionType::B
           fields
             it @49
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: num
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: num
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
 ''');
   }
@@ -1706,29 +1586,24 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -1774,29 +1649,24 @@
           fields
             it @22
               reference: <testLibraryFragment>::@extensionType::X::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::X
               getter2: <testLibraryFragment>::@extensionType::X::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::X::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::X
   extensionTypes
     extension type X
       reference: <testLibraryFragment>::@extensionType::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::X
       typeErasure: int?
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::X
           type: int?
           firstFragment: <testLibraryFragment>::@extensionType::X::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::X
           firstFragment: <testLibraryFragment>::@extensionType::X::@getter::it
 ''');
   }
@@ -1847,16 +1717,13 @@
           fields
             it @22
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -1864,14 +1731,12 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: T
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -1924,29 +1789,24 @@
           fields
             it @39
               reference: <testLibraryFragment>::@extensionType::X::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::X
               getter2: <testLibraryFragment>::@extensionType::X::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::X::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::X
   extensionTypes
     extension type X
       reference: <testLibraryFragment>::@extensionType::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::X
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::X
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::X::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::X
           firstFragment: <testLibraryFragment>::@extensionType::X::@getter::it
 ''');
   }
@@ -2003,17 +1863,14 @@
           fields
             promotable _it @22
               reference: <testLibraryFragment>::@extensionType::A::@field::_it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::_it
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         _it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::_it
           getter: <none>
@@ -2021,12 +1878,10 @@
       getters
         synthetic get _it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::_it
       setters
         synthetic set _it=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional __it
               reference: <none>
@@ -2034,37 +1889,31 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::_it
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic _it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::_it
           getter: <none>
       getters
         get _it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::_it
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int?
       fields
         final _it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int?
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::_it
           getter: <none>
       getters
         synthetic get _it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::_it
   fieldNameNonPromotabilityInfo
     _it
@@ -2147,26 +1996,21 @@
           fields
             it @43
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @37
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -2181,7 +2025,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -2237,35 +2080,29 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           methods
             foo @34
               reference: <testLibraryFragment>::@extensionType::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 a @42
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       methods
         foo
@@ -2334,36 +2171,30 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           methods
             foo @34
               reference: <testLibraryFragment>::@extensionType::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 default a @43
                   reference: <testLibraryFragment>::@extensionType::A::@method::foo::@parameter::a
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       methods
         foo
@@ -2433,22 +2264,18 @@
           fields
             <empty> @17
               reference: <testLibraryFragment>::@extensionType::A::@field::<empty>
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::<empty>
           constructors
             new @15
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               codeOffset: 16
               codeLength: 2
           getters
             get <empty> @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::<empty>
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 21
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -2456,7 +2283,6 @@
       fields
         final <empty>
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: InvalidType
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::<empty>
           getter: <none>
@@ -2471,7 +2297,6 @@
       getters
         synthetic get <empty>
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::<empty>
 ''');
   }
@@ -2523,16 +2348,13 @@
           fields
             it @34
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: A<dynamic>
@@ -2541,14 +2363,12 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -2607,50 +2427,41 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           setters
             set foo= @33
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _ @44
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: double
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           setter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _
               reference: <none>
@@ -2718,57 +2529,47 @@
           fields
             it @19
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type B @42
           reference: <testLibraryFragment>::@extensionType::B
           fields
             it @46
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: InvalidType
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: InvalidType
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: InvalidType
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: InvalidType
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
 ''');
   }
@@ -2832,57 +2633,47 @@
           fields
             it @19
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type B @42
           reference: <testLibraryFragment>::@extensionType::B
           fields
             it @52
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: InvalidType
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: B
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: InvalidType
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: InvalidType
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
 ''');
   }
@@ -2928,29 +2719,24 @@
           fields
             it @19
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: InvalidType
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: InvalidType
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -3014,57 +2800,47 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type B @44
           reference: <testLibraryFragment>::@extensionType::B
           fields
             it @62
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: int Function(int)
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: A Function(A)
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
 ''');
   }
@@ -3133,27 +2909,22 @@
           fields
             it @22
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type B @45
           reference: <testLibraryFragment>::@extensionType::B
           fields
             it @57
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -3161,31 +2932,26 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: T
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: double
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: A<double>
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
 ''');
   }
@@ -3249,57 +3015,47 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type B @44
           reference: <testLibraryFragment>::@extensionType::B
           fields
             it @54
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: List<int>
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: List<A>
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
 ''');
   }
@@ -3345,29 +3101,24 @@
           fields
             it @21
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -3429,20 +3180,16 @@
           fields
             it @45
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @15
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: num
@@ -3452,7 +3199,6 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: Map<T, U>
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -3467,7 +3213,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -3580,16 +3325,13 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -3607,13 +3349,11 @@
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -3628,7 +3368,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
   exportedReferences
     declared <testLibraryFragment>::@extensionType::A
@@ -3751,20 +3490,16 @@
           fields
             it @65
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@field::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::it
           constructors
             augment new @59
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@constructorAugmentation::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
           getters
             get it @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
           methods
             foo1 @78
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       extensionTypes
@@ -3774,17 +3509,14 @@
           methods
             foo2 @60
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@method::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@field::it
           getter: <none>
@@ -3799,7 +3531,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::it
       methods
         foo1
@@ -3900,16 +3631,13 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -3919,19 +3647,16 @@
           constructors
             named @60
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               periodOffset: 59
               nameEnd: 65
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -3949,7 +3674,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -4056,16 +3780,13 @@
           fields
             it @40
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -4077,13 +3798,11 @@
           constructors
             named @64
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               periodOffset: 63
               nameEnd: 69
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -4091,7 +3810,6 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -4113,7 +3831,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -4207,18 +3924,15 @@
           fields
             it @42
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             named @32
               reference: <testLibraryFragment>::@extensionType::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               periodOffset: 31
               nameEnd: 37
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -4228,17 +3942,14 @@
           constructors
             new @58
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -4256,7 +3967,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -4385,29 +4095,23 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @55
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -4419,24 +4123,20 @@
           fields
             foo @77
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@field::foo
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
@@ -4452,16 +4152,13 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -4626,29 +4323,23 @@
           fields
             it @51
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @70
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo
           constructors
             new @45
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -4662,7 +4353,6 @@
           fields
             foo @77
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@field::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -4674,24 +4364,20 @@
           fields
             foo @77
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
@@ -4707,16 +4393,13 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -4881,30 +4564,24 @@
           fields
             it @51
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @70
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo
           constructors
             new @45
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -4918,7 +4595,6 @@
           getters
             augment get foo @81
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
@@ -4929,24 +4605,20 @@
           fields
             foo @77
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@field::foo
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
@@ -4962,16 +4634,13 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -5139,29 +4808,23 @@
           fields
             it @51
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @70
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo
           constructors
             new @45
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _foo @-1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@setterAugmentation::foo
@@ -5176,7 +4839,6 @@
           setters
             augment set foo= @77
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               parameters
                 _ @85
               previousFragment: <testLibraryFragment>::@extensionType::A::@setter::foo
@@ -5189,24 +4851,20 @@
           fields
             foo @77
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@field::foo
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
@@ -5222,16 +4880,13 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -5364,29 +5019,23 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @55
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -5398,24 +5047,20 @@
           fields
             foo @80
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@field::foo
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
@@ -5431,16 +5076,13 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -5563,24 +5205,19 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @59
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -5590,24 +5227,20 @@
           fields
             foo @77
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@field::foo
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         synthetic static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
@@ -5622,11 +5255,9 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
 ''');
   }
@@ -5774,28 +5405,22 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo1 @55
               reference: <testLibraryFragment>::@extensionType::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo1
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo1
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo1 @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           setters
             set foo1= @-1
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _foo1 @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -5807,42 +5432,35 @@
           fields
             foo2 @69
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::foo2
               setter2: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@setter::foo2
           getters
             get foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
           setters
             set foo2= @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               parameters
                 _foo2 @-1
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo1
           getter: <none>
           setter: <none>
         static foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@field::foo2
           getter: <none>
@@ -5858,20 +5476,16 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo1
         synthetic static get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::foo2
       setters
         synthetic static set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _foo1
               reference: <none>
@@ -5879,7 +5493,6 @@
           firstFragment: <testLibraryFragment>::@extensionType::A::@setter::foo1
         synthetic static set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _foo2
               reference: <none>
@@ -6007,23 +5620,18 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo1 @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo1
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo1 @52
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -6033,34 +5641,28 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::foo2
           getters
             get foo2 @66
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@field::foo2
           getter: <none>
@@ -6075,15 +5677,12 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo1
         get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::foo2
 ''');
   }
@@ -6219,23 +5818,18 @@
           fields
             it @40
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo1 @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo1
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo1 @55
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -6247,16 +5841,13 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::foo2
           getters
             get foo2 @69
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -6264,19 +5855,16 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: T1
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: T2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@field::foo2
           getter: <none>
@@ -6291,15 +5879,12 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         abstract get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo1
         abstract get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getter::foo2
 ''');
   }
@@ -6428,29 +6013,23 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @55
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -6462,24 +6041,20 @@
           getters
             augment get foo @81
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
@@ -6495,16 +6070,13 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -6669,29 +6241,23 @@
           fields
             it @51
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @70
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo
           constructors
             new @45
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -6705,7 +6271,6 @@
           getters
             augment get foo @81
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -6717,24 +6282,20 @@
           getters
             augment get foo @81
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
@@ -6750,16 +6311,13 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -6895,31 +6453,24 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo1 @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo1
             foo2 @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo2
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo2
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo1 @52
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo1
             get foo2 @73
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo2
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -6929,30 +6480,25 @@
           getters
             augment get foo1 @74
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@getter::foo1
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo2
           getter: <none>
@@ -6967,15 +6513,12 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo2
         get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo1
 ''');
   }
@@ -7124,23 +6667,18 @@
           fields
             it @51
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
           constructors
             new @45
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @67
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -7153,7 +6691,6 @@
           getters
             augment get foo @74
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -7165,24 +6702,20 @@
           getters
             augment get foo @74
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@getterAugmentation::foo
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
@@ -7197,11 +6730,9 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
 ''');
   }
@@ -7318,23 +6849,19 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type I1 @72
           reference: <testLibraryFragment>::@extensionType::I1
           fields
             it @79
               reference: <testLibraryFragment>::@extensionType::I1::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
               getter2: <testLibraryFragment>::@extensionType::I1::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::I1::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -7346,63 +6873,52 @@
           fields
             it @93
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@field::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
           getters
             get it @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type I1
       reference: <testLibraryFragment>::@extensionType::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::I1
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::I1
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::I1::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::I1
           firstFragment: <testLibraryFragment>::@extensionType::I1::@getter::it
     extension type I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
 ''');
   }
@@ -7593,31 +7109,25 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type I1 @72
           reference: <testLibraryFragment>::@extensionType::I1
           fields
             it @79
               reference: <testLibraryFragment>::@extensionType::I1::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
               getter2: <testLibraryFragment>::@extensionType::I1::@getter::it
           constructors
             new @72
               reference: <testLibraryFragment>::@extensionType::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::I1::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -7631,16 +7141,13 @@
           fields
             it @108
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@field::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
           constructors
             new @101
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           getters
             get it @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       extensionTypes
@@ -7652,26 +7159,21 @@
           fields
             it @90
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3::@field::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3
               getter2: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3::@getter::it
           constructors
             new @83
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3
           getters
             get it @-1
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3::@getter::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -7686,17 +7188,14 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type I1
       reference: <testLibraryFragment>::@extensionType::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::I1
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::I1
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::I1::@field::it
           getter: <none>
@@ -7711,17 +7210,14 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::I1
           firstFragment: <testLibraryFragment>::@extensionType::I1::@getter::it
     extension type I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@field::it
           getter: <none>
@@ -7736,17 +7232,14 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
     extension type I3
       reference: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3::@field::it
           getter: <none>
@@ -7761,7 +7254,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3
           firstFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionType::I3::@getter::it
 ''');
   }
@@ -7914,31 +7406,25 @@
           fields
             it @39
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type I1 @75
           reference: <testLibraryFragment>::@extensionType::I1
           fields
             it @82
               reference: <testLibraryFragment>::@extensionType::I1::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
               getter2: <testLibraryFragment>::@extensionType::I1::@getter::it
           constructors
             new @75
               reference: <testLibraryFragment>::@extensionType::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::I1::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -7954,20 +7440,16 @@
           fields
             it @104
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@field::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
           constructors
             new @94
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           getters
             get it @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -7975,7 +7457,6 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -7990,17 +7471,14 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type I1
       reference: <testLibraryFragment>::@extensionType::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::I1
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::I1
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::I1::@field::it
           getter: <none>
@@ -8015,11 +7493,9 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::I1
           firstFragment: <testLibraryFragment>::@extensionType::I1::@getter::it
     extension type I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
@@ -8027,7 +7503,6 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@field::it
           getter: <none>
@@ -8042,7 +7517,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
 ''');
   }
@@ -8196,31 +7670,25 @@
           fields
             it @39
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
         extension type I1 @75
           reference: <testLibraryFragment>::@extensionType::I1
           fields
             it @82
               reference: <testLibraryFragment>::@extensionType::I1::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
               getter2: <testLibraryFragment>::@extensionType::I1::@getter::it
           constructors
             new @75
               reference: <testLibraryFragment>::@extensionType::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::I1::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::I1
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -8237,20 +7705,16 @@
           fields
             it @108
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@field::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
               getter2: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
           constructors
             new @98
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           getters
             get it @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -8258,7 +7722,6 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -8273,17 +7736,14 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
     extension type I1
       reference: <testLibraryFragment>::@extensionType::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::I1
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::I1
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::I1::@field::it
           getter: <none>
@@ -8298,11 +7758,9 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::I1
           firstFragment: <testLibraryFragment>::@extensionType::I1::@getter::it
     extension type I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
@@ -8310,7 +7768,6 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@field::it
           getter: <none>
@@ -8325,7 +7782,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionType::I2::@getter::it
 ''');
   }
@@ -8427,20 +7883,16 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           methods
             foo @49
               reference: <testLibraryFragment>::@extensionType::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -8450,17 +7902,14 @@
           methods
             bar @63
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -8475,7 +7924,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       methods
         foo
@@ -8591,24 +8039,19 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           methods
             foo1 @49
               reference: <testLibraryFragment>::@extensionType::A::@method::foo1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             foo2 @66
               reference: <testLibraryFragment>::@extensionType::A::@method::foo2
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -8619,17 +8062,14 @@
             augment foo1 @71
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo1
               previousFragment: <testLibraryFragment>::@extensionType::A::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -8644,7 +8084,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       methods
         foo2
@@ -8784,21 +8223,17 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           methods
             foo @49
               reference: <testLibraryFragment>::@extensionType::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -8812,7 +8247,6 @@
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@extensionType::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       extensionTypes
@@ -8823,17 +8257,14 @@
             augment foo @68
               reference: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@extensionTypeAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -8848,7 +8279,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       methods
         foo
@@ -8964,20 +8394,16 @@
           fields
             it @39
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           methods
             foo @49
               reference: <testLibraryFragment>::@extensionType::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -8989,11 +8415,9 @@
           methods
             bar @65
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -9001,7 +8425,6 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -9016,7 +8439,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       methods
         foo
@@ -9136,21 +8558,17 @@
           fields
             it @39
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           methods
             foo @49
               reference: <testLibraryFragment>::@extensionType::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -9163,11 +8581,9 @@
             augment foo @73
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@extensionType::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@extensionType::A
@@ -9175,7 +8591,6 @@
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -9190,7 +8605,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       methods
         foo
@@ -9308,24 +8722,19 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           methods
             foo @49
               reference: <testLibraryFragment>::@extensionType::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             bar @65
               reference: <testLibraryFragment>::@extensionType::A::@method::bar
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       extensionTypes
@@ -9338,17 +8747,14 @@
             augment foo @74
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@extensionType::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
@@ -9363,7 +8769,6 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       methods
         bar
@@ -9500,24 +8905,19 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo1 @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo1
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           setters
             set foo1= @48
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _ @57
     <testLibrary>::@fragment::package:test/a.dart
@@ -9529,36 +8929,30 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               setter2: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@setter::foo2
           setters
             set foo2= @62
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               parameters
                 _ @71
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo1
           setter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@field::foo2
           setter: <none>
@@ -9573,12 +8967,10 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       setters
         set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _
               reference: <none>
@@ -9586,7 +8978,6 @@
           firstFragment: <testLibraryFragment>::@extensionType::A::@setter::foo1
         set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _
               reference: <none>
@@ -9722,28 +9113,22 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo @55
               reference: <testLibraryFragment>::@extensionType::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::foo
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
             get foo @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _foo @-1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@setterAugmentation::foo
@@ -9756,26 +9141,22 @@
           setters
             augment set foo= @77
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               parameters
                 _ @85
               previousFragment: <testLibraryFragment>::@extensionType::A::@setter::foo
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         static foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo
           getter: <none>
@@ -9791,16 +9172,13 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::foo
       setters
         synthetic static set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -9945,34 +9323,27 @@
           fields
             it @36
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
             foo1 @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo1
             foo2 @-1
               reference: <testLibraryFragment>::@extensionType::A::@field::foo2
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               setter2: <testLibraryFragment>::@extensionType::A::@setter::foo2
           constructors
             new @30
               reference: <testLibraryFragment>::@extensionType::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
           setters
             set foo1= @48
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _ @57
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@setterAugmentation::foo1
             set foo2= @69
               reference: <testLibraryFragment>::@extensionType::A::@setter::foo2
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               parameters
                 _ @78
     <testLibrary>::@fragment::package:test/a.dart
@@ -9984,32 +9355,27 @@
           setters
             augment set foo1= @70
               reference: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A::@setterAugmentation::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@extensionTypeAugmentation::A
               parameters
                 _ @79
               previousFragment: <testLibraryFragment>::@extensionType::A::@setter::foo1
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo1
           setter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::foo2
           setter: <none>
@@ -10024,12 +9390,10 @@
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
       setters
         set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _
               reference: <none>
@@ -10037,7 +9401,6 @@
           firstFragment: <testLibraryFragment>::@extensionType::A::@setter::foo2
         set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           parameters
             requiredPositional _
               reference: <none>
@@ -10133,12 +9496,10 @@
           fields
             it @52
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -10153,29 +9514,24 @@
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
     class A
       reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
@@ -10274,12 +9630,10 @@
           fields
             it @52
               reference: <testLibraryFragment>::@extensionType::A::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
               getter2: <testLibraryFragment>::@extensionType::A::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::A::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -10295,25 +9649,21 @@
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
   extensionTypes
     extension type A
       reference: <testLibraryFragment>::@extensionType::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::A
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::A::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::A
           firstFragment: <testLibraryFragment>::@extensionType::A::@getter::it
 ''');
   }
diff --git a/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart b/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart
index 38e54ca..b5c6bc3 100644
--- a/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart
@@ -82,18 +82,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 default a @32
                   reference: <testLibraryFragment>::@class::A::@method::m::@parameter::a
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -150,17 +147,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 default a @32
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -217,17 +211,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @31
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -314,11 +305,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             f @20
               reference: <testLibraryFragment>::@class::A::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 t @34
         class B @48
@@ -328,20 +317,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: T}
           methods
             f @75
               reference: <testLibraryFragment>::@class::B::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 t @79
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -359,7 +345,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::f
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -442,11 +427,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 default a @32
                   reference: <testLibraryFragment>::@class::A::@method::m::@parameter::a
@@ -455,19 +438,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @68
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 default a @73
                   reference: <testLibraryFragment>::@class::B::@method::m::@parameter::a
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -483,7 +463,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -543,17 +522,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @10
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 g @12
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -624,17 +600,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @16
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 g @20
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         A
         B
@@ -694,17 +667,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @10
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 g @16
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -757,17 +727,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @10
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 g @17
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -874,18 +841,15 @@
           constructors
             positional @14
               reference: <testLibraryFragment>::@class::C::@constructor::positional
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 13
               nameEnd: 24
             named @39
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 38
               nameEnd: 44
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         positional
@@ -982,39 +946,32 @@
           fields
             x @16
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             positional @23
               reference: <testLibraryFragment>::@class::C::@constructor::positional
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 22
               nameEnd: 33
             named @53
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 52
               nameEnd: 58
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -1037,12 +994,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -1110,23 +1065,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             positional @24
               reference: <testLibraryFragment>::@class::C::@method::positional
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 default x @36
             named @61
               reference: <testLibraryFragment>::@class::C::@method::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 default x @68
                   reference: <testLibraryFragment>::@class::C::@method::named::@parameter::x
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
diff --git a/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart b/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart
index d93566e..8afb452 100644
--- a/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart
@@ -52,23 +52,19 @@
       topLevelVariables
         f @16
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: void Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
       getter: <none>
@@ -76,12 +72,10 @@
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -126,23 +120,19 @@
       topLevelVariables
         f @17
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: void Function()?
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
       getter: <none>
@@ -150,12 +140,10 @@
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -283,15 +271,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @42
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -367,23 +352,19 @@
       topLevelVariables
         v @30
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function(int, String)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -391,12 +372,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -494,17 +473,14 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @64
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -514,7 +490,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -623,11 +598,9 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         v @62
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @29
@@ -675,17 +648,14 @@
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -696,7 +666,6 @@
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -704,12 +673,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -817,20 +784,16 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         const v @35
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -841,14 +804,12 @@
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A<String Function({int? a})>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -952,20 +913,16 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         const v @35
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -976,14 +933,12 @@
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A<String Function([int?])>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -1087,20 +1042,16 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         const v @35
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -1111,14 +1062,12 @@
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A<String Function({required int a})>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -1216,20 +1165,16 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         const v @35
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -1240,14 +1185,12 @@
   topLevelVariables
     const v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A<String Function(int)>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -1286,7 +1229,6 @@
   mixins
     mixin B
       reference: <testLibraryFragment>::@mixin::B
-      enclosingElement2: <testLibrary>
       typeParameters
         X
           bound: void Function()
@@ -1359,13 +1301,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @31
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -1382,7 +1322,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -1392,7 +1331,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class alias B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A<void Function()>
       constructors
@@ -1403,7 +1341,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
diff --git a/pkg/analyzer/test/src/summary/elements/library_export_test.dart b/pkg/analyzer/test/src/summary/elements/library_export_test.dart
index c17a3d8..d32fac5 100644
--- a/pkg/analyzer/test/src/summary/elements/library_export_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/library_export_test.dart
@@ -283,11 +283,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       constructors
         synthetic new
@@ -533,11 +531,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       constructors
         synthetic new
@@ -894,12 +890,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/foo.dart::<fragment>::@class::A::@constructor::new
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -967,12 +961,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/foo_io.dart::<fragment>::@class::A::@constructor::new
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -1040,12 +1032,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/foo_html.dart::<fragment>::@class::A::@constructor::new
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -1170,7 +1160,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -1182,11 +1171,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::B::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -1194,7 +1181,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B
       constructors
         synthetic new
@@ -1311,7 +1297,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
     <testLibrary>::@fragment::package:test/d.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/e.dart
@@ -1320,7 +1305,6 @@
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       constructors
         synthetic new
@@ -1412,13 +1396,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibraryFragment>
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       constructors
         synthetic new
@@ -1505,13 +1487,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibraryFragment>
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       constructors
         synthetic new
@@ -1606,13 +1586,11 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
     mixin B
       reference: <testLibrary>::@fragment::package:test/a.dart::@mixin::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixin::B
       superclassConstraints
         Object
@@ -1714,7 +1692,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -1724,7 +1701,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
@@ -1733,11 +1709,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/b.dart::@class::B::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@class::B
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1745,7 +1719,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
       constructors
         synthetic new
@@ -1753,7 +1726,6 @@
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A::@constructor::new
     class B
       reference: <testLibrary>::@fragment::package:test/b.dart::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@class::B
       constructors
         synthetic new
@@ -1859,7 +1831,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
     <testLibrary>::@fragment::package:test/c.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/d.dart
@@ -1868,7 +1839,6 @@
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       constructors
         synthetic new
@@ -1949,23 +1919,19 @@
       topLevelVariables
         a @25
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::a
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::a
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::a
       getters
         get a @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::a
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
       setters
         set a= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::a
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _a @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::a
       getter: <none>
@@ -1973,12 +1939,10 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::a
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -2052,23 +2016,19 @@
       topLevelVariables
         const a @27
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::a
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::a
       getters
         get a @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::a
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::a
   exportedReferences
     declared <testLibrary>::@fragment::package:test/a.dart::@getter::a
diff --git a/pkg/analyzer/test/src/summary/elements/library_import_test.dart b/pkg/analyzer/test/src/summary/elements/library_import_test.dart
index 7502167..a4aca82 100644
--- a/pkg/analyzer/test/src/summary/elements/library_import_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/library_import_test.dart
@@ -70,12 +70,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/foo.dart::<fragment>::@class::A::@constructor::new
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -141,12 +139,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/foo_io.dart::<fragment>::@class::A::@constructor::new
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -212,12 +208,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/foo_io.dart::<fragment>::@class::A::@constructor::new
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -283,12 +277,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/foo_html.dart::<fragment>::@class::A::@constructor::new
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -354,12 +346,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/foo_html.dart::<fragment>::@class::A::@constructor::new
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -632,23 +622,19 @@
       topLevelVariables
         f @51
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
       getter: <none>
@@ -656,12 +642,10 @@
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -803,23 +787,19 @@
       topLevelVariables
         f @52
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
       getter: <none>
@@ -827,12 +807,10 @@
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -903,23 +881,19 @@
       topLevelVariables
         c @26
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -927,12 +901,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -1009,18 +981,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @42
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
               superConstructor: <testLibraryFragment>::@class::C::@constructor::new
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1028,7 +997,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       supertype: C
       constructors
@@ -1106,43 +1074,35 @@
       topLevelVariables
         f @48
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
         s @58
           reference: <testLibraryFragment>::@topLevelVariable::s
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::s
           setter2: <testLibraryFragment>::@setter::s
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
         get s @-1
           reference: <testLibraryFragment>::@getter::s
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
         set s= @-1
           reference: <testLibraryFragment>::@setter::s
-          enclosingFragment: <testLibraryFragment>
           parameters
             _s @-1
   topLevelVariables
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
       getter: <none>
       setter: <none>
     s
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Stream<dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::s
       getter: <none>
@@ -1150,16 +1110,13 @@
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
     synthetic static get s
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::s
   setters
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -1167,7 +1124,6 @@
       firstFragment: <testLibraryFragment>::@setter::f
     synthetic static set s=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _s
           reference: <none>
@@ -1264,43 +1220,35 @@
       topLevelVariables
         c @36
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         d @41
           reference: <testLibraryFragment>::@topLevelVariable::d
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::d
           setter2: <testLibraryFragment>::@setter::d
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get d @-1
           reference: <testLibraryFragment>::@getter::d
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set d= @-1
           reference: <testLibraryFragment>::@setter::d
-          enclosingFragment: <testLibraryFragment>
           parameters
             _d @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     d
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: D
       firstFragment: <testLibraryFragment>::@topLevelVariable::d
       getter: <none>
@@ -1308,16 +1256,13 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get d
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::d
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -1325,7 +1270,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set d=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _d
           reference: <none>
@@ -1647,23 +1591,19 @@
       topLevelVariables
         const a @29
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -1759,23 +1699,19 @@
       topLevelVariables
         const a @42
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -1842,23 +1778,19 @@
       topLevelVariables
         v @36
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -1866,12 +1798,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
diff --git a/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart b/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart
index f62dbc7..4b73dfa 100644
--- a/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart
@@ -79,11 +79,9 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -131,15 +129,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @12
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -183,23 +178,19 @@
       topLevelVariables
         synthetic g @-1
           reference: <testLibraryFragment>::@topLevelVariable::g
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::g
       getters
         get g @4
           reference: <testLibraryFragment>::@getter::g
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     synthetic g
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::g
       getter: <none>
   getters
     static get g
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::g
 ''');
   }
@@ -242,11 +233,9 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -298,15 +287,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @12
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
diff --git a/pkg/analyzer/test/src/summary/elements/metadata_test.dart b/pkg/analyzer/test/src/summary/elements/metadata_test.dart
index 338db11..797f38b 100644
--- a/pkg/analyzer/test/src/summary/elements/metadata_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/metadata_test.dart
@@ -93,17 +93,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class A @31
           reference: <testLibraryFragment>::@class::A
           constructors
             const new @43
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -111,7 +108,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -188,17 +184,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class A @33
           reference: <testLibraryFragment>::@class::A
           constructors
             const new @45
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -206,7 +199,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -300,11 +292,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -376,11 +366,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -469,41 +457,33 @@
           fields
             x @34
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -515,12 +495,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -529,14 +507,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -650,20 +626,16 @@
           fields
             foo @54
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::C::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             bar @77
               reference: <testLibraryFragment>::@class::C::@method::bar
-              enclosingFragment: <testLibraryFragment>::@class::C
               metadata
                 Annotation
                   atSign: @ @65
@@ -675,16 +647,13 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -699,7 +668,6 @@
       fields
         static const foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
@@ -710,7 +678,6 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo
       methods
         bar
@@ -727,14 +694,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -815,27 +780,21 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @22
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -844,24 +803,20 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -943,7 +898,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -957,26 +911,21 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @56
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       constructors
@@ -986,7 +935,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -994,7 +942,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -1003,14 +950,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -1084,7 +1029,6 @@
           constructors
             const named @20
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 19
               nameEnd: 25
         class C @54
@@ -1092,11 +1036,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const named
@@ -1108,7 +1050,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::named
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1198,7 +1139,6 @@
           constructors
             const named @23
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 22
               nameEnd: 28
         class C @56
@@ -1206,11 +1146,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -1224,7 +1162,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::named
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1310,7 +1247,6 @@
           constructors
             const named @23
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 22
               nameEnd: 28
         class C @57
@@ -1318,11 +1254,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -1332,7 +1266,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::named
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1418,7 +1351,6 @@
           constructors
             const named @23
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 22
               nameEnd: 28
         class C @57
@@ -1426,11 +1358,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -1440,7 +1370,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::named
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1537,11 +1466,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1642,11 +1569,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1751,11 +1676,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1869,7 +1792,6 @@
           constructors
             const named @20
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 19
               nameEnd: 25
         class C @50
@@ -1879,7 +1801,6 @@
           constructors
             synthetic const named @-1
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -1898,14 +1819,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
       mixins
         mixin B @38
           reference: <testLibraryFragment>::@mixin::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const named
@@ -1913,7 +1832,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::named
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -1925,7 +1843,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::named
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -1934,7 +1851,6 @@
   mixins
     mixin B
       reference: <testLibraryFragment>::@mixin::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::B
       superclassConstraints
         Object
@@ -2000,17 +1916,14 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @42
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -2022,7 +1935,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -2098,17 +2010,14 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @44
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -2122,7 +2031,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -2199,17 +2107,14 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @45
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -2219,7 +2124,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -2304,11 +2208,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -2402,11 +2304,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -2504,11 +2404,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -2603,7 +2501,6 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @44
           reference: <testLibraryFragment>::@class::C
           typeParameters
@@ -2611,7 +2508,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -2625,14 +2521,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
       mixins
         mixin B @32
           reference: <testLibraryFragment>::@mixin::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -2640,7 +2534,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -2652,7 +2545,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -2661,7 +2553,6 @@
   mixins
     mixin B
       reference: <testLibraryFragment>::@mixin::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::B
       superclassConstraints
         Object
@@ -2722,17 +2613,14 @@
           constructors
             const new @16
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @39
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -2744,7 +2632,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -2807,7 +2694,6 @@
           constructors
             named @31
               reference: <testLibraryFragment>::@class::C::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::C
               metadata
                 Annotation
                   atSign: @ @26
@@ -2821,16 +2707,13 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         named
@@ -2847,14 +2730,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -2910,7 +2791,6 @@
           constructors
             new @29
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               metadata
                 Annotation
                   atSign: @ @26
@@ -2922,16 +2802,13 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         new
@@ -2948,14 +2825,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -3033,23 +2908,19 @@
       topLevelVariables
         const a @28
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -3122,41 +2993,33 @@
           fields
             x @33
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -3168,12 +3031,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -3182,14 +3043,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -3272,41 +3131,33 @@
           fields
             x @32
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @37
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -3330,12 +3181,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -3344,14 +3193,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -3433,41 +3280,33 @@
           fields
             x @30
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             new @33
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -3491,12 +3330,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -3505,14 +3342,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -3566,23 +3401,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -3635,19 +3466,15 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         synthetic f @-1
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get f @23
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @16
@@ -3659,24 +3486,20 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     synthetic f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       metadata
         Annotation
           atSign: @ @16
@@ -3740,20 +3563,16 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         synthetic f @-1
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::f
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @23
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @16
@@ -3767,25 +3586,21 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     synthetic f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
       setter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
   setters
     static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       metadata
         Annotation
           atSign: @ @16
@@ -3848,23 +3663,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -3917,23 +3728,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -3990,23 +3797,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -4082,40 +3885,32 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @22
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -4172,23 +3967,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -4248,23 +4039,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -4323,23 +4110,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -4395,11 +4178,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -4540,23 +4321,19 @@
       topLevelVariables
         const a @20
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -4623,16 +4400,13 @@
           fields
             m @-1
               reference: <testLibraryFragment>::@class::C::@field::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::m
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get m @33
               reference: <testLibraryFragment>::@class::C::@getter::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               metadata
                 Annotation
                   atSign: @ @26
@@ -4644,21 +4418,17 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic m
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::m
           getter: <none>
@@ -4669,7 +4439,6 @@
       getters
         get m
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           metadata
             Annotation
               atSign: @ @26
@@ -4682,14 +4451,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -4778,11 +4545,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @54
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               metadata
                 Annotation
                   atSign: @ @44
@@ -4801,23 +4566,18 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @22
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -4845,24 +4605,20 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -4949,7 +4705,6 @@
           methods
             m @54
               reference: <testLibraryFragment>::@mixin::M::@method::m
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               metadata
                 Annotation
                   atSign: @ @44
@@ -4968,23 +4723,18 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @22
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -5010,24 +4760,20 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -5102,16 +4848,13 @@
           fields
             m @-1
               reference: <testLibraryFragment>::@class::C::@field::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::m
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set m= @37
               reference: <testLibraryFragment>::@class::C::@setter::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               metadata
                 Annotation
                   atSign: @ @28
@@ -5125,21 +4868,17 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic m
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::m
           setter: <none>
@@ -5150,7 +4889,6 @@
       setters
         set m=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           metadata
             Annotation
               atSign: @ @28
@@ -5167,14 +4905,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -5286,16 +5022,13 @@
           fields
             foo @54
               reference: <testLibraryFragment>::@mixin::M::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@mixin::M::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
           methods
             bar @77
               reference: <testLibraryFragment>::@mixin::M::@method::bar
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               metadata
                 Annotation
                   atSign: @ @65
@@ -5307,16 +5040,13 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -5333,14 +5063,12 @@
       fields
         static const foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::foo
           getter: <none>
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::foo
       methods
         bar
@@ -5357,14 +5085,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -5443,47 +5169,38 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         const b @22
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     const b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -5565,20 +5282,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -5597,14 +5310,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -5678,7 +5389,6 @@
           constructors
             new @35
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               metadata
                 Annotation
                   atSign: @ @28
@@ -5690,16 +5400,13 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -5728,14 +5435,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -5808,16 +5513,13 @@
           fields
             getter @-1
               reference: <testLibraryFragment>::@class::A::@field::getter
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::getter
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get getter @43
               reference: <testLibraryFragment>::@class::A::@getter::getter
-              enclosingFragment: <testLibraryFragment>::@class::A
               metadata
                 Annotation
                   atSign: @ @28
@@ -5829,21 +5531,17 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic getter
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::getter
           getter: <none>
@@ -5854,7 +5552,6 @@
       getters
         get getter
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           metadata
             Annotation
               atSign: @ @28
@@ -5867,14 +5564,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -5964,11 +5659,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             method @40
               reference: <testLibraryFragment>::@class::A::@method::method
-              enclosingFragment: <testLibraryFragment>::@class::A
               metadata
                 Annotation
                   atSign: @ @28
@@ -6000,16 +5693,13 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -6052,14 +5742,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -6143,16 +5831,13 @@
           fields
             setter @-1
               reference: <testLibraryFragment>::@class::A::@field::setter
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::setter
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set setter= @39
               reference: <testLibraryFragment>::@class::A::@setter::setter
-              enclosingFragment: <testLibraryFragment>::@class::A
               metadata
                 Annotation
                   atSign: @ @28
@@ -6174,21 +5859,17 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic setter
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::setter
           setter: <none>
@@ -6199,7 +5880,6 @@
       setters
         set setter=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           metadata
             Annotation
               atSign: @ @28
@@ -6224,14 +5904,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -6330,7 +6008,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @50
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -6346,7 +6023,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -6361,16 +6037,13 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -6378,7 +6051,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class alias B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -6399,21 +6071,18 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -6586,74 +6255,58 @@
           fields
             enumConstant e1 @37
               reference: <testLibraryFragment>::@enum::E::@field::e1
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::e1
             enumConstant e2 @43
               reference: <testLibraryFragment>::@enum::E::@field::e2
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::e2
             enumConstant e3 @54
               reference: <testLibraryFragment>::@enum::E::@field::e3
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::e3
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get e1 @-1
               reference: <testLibraryFragment>::@enum::E::@getter::e1
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get e2 @-1
               reference: <testLibraryFragment>::@enum::E::@getter::e2
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get e3 @-1
               reference: <testLibraryFragment>::@enum::E::@getter::e3
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const e1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::e1
           getter: <none>
         static const e2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::e2
           getter: <none>
         static const e3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::e3
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -6664,31 +6317,25 @@
       getters
         synthetic static get e1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::e1
         synthetic static get e2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::e2
         synthetic static get e3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::e3
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -6767,16 +6414,13 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -6791,14 +6435,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -6930,74 +6572,59 @@
           fields
             isStatic @42
               reference: <testLibraryFragment>::@class::A::@field::isStatic
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::isStatic
               setter2: <testLibraryFragment>::@class::A::@setter::isStatic
             isStaticConst @79
               reference: <testLibraryFragment>::@class::A::@field::isStaticConst
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::isStaticConst
             isInstance @112
               reference: <testLibraryFragment>::@class::A::@field::isInstance
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::isInstance
               setter2: <testLibraryFragment>::@class::A::@setter::isInstance
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get isStatic @-1
               reference: <testLibraryFragment>::@class::A::@getter::isStatic
-              enclosingFragment: <testLibraryFragment>::@class::A
             get isStaticConst @-1
               reference: <testLibraryFragment>::@class::A::@getter::isStaticConst
-              enclosingFragment: <testLibraryFragment>::@class::A
             get isInstance @-1
               reference: <testLibraryFragment>::@class::A::@getter::isInstance
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set isStatic= @-1
               reference: <testLibraryFragment>::@class::A::@setter::isStatic
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _isStatic @-1
             set isInstance= @-1
               reference: <testLibraryFragment>::@class::A::@setter::isInstance
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _isInstance @-1
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static isStatic
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::isStatic
           getter: <none>
           setter: <none>
         static const isStaticConst
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::isStaticConst
           getter: <none>
         isInstance
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::isInstance
           getter: <none>
@@ -7009,20 +6636,16 @@
       getters
         synthetic static get isStatic
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::isStatic
         synthetic static get isStaticConst
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::isStaticConst
         synthetic get isInstance
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::isInstance
       setters
         synthetic static set isStatic=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _isStatic
               reference: <none>
@@ -7030,7 +6653,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::isStatic
         synthetic set isInstance=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _isInstance
               reference: <none>
@@ -7039,14 +6661,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -7110,23 +6730,19 @@
       topLevelVariables
         const foo @52
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -7206,16 +6822,13 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -7232,14 +6845,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -7317,23 +6928,19 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -7421,23 +7028,19 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -7532,12 +7135,10 @@
       topLevelVariables
         const foo @65
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -7546,14 +7147,12 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -7635,23 +7234,19 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -7709,19 +7304,15 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
         synthetic getter @-1
           reference: <testLibraryFragment>::@topLevelVariable::getter
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::getter
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
         get getter @29
           reference: <testLibraryFragment>::@getter::getter
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @16
@@ -7733,24 +7324,20 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
     synthetic getter
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::getter
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
     static get getter
       reference: <none>
-      enclosingElement: <testLibrary>
       metadata
         Annotation
           atSign: @ @16
@@ -7827,20 +7414,16 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
         synthetic setter @-1
           reference: <testLibraryFragment>::@topLevelVariable::setter
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::setter
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
       setters
         set setter= @25
           reference: <testLibraryFragment>::@setter::setter
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @16
@@ -7862,25 +7445,21 @@
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
     synthetic setter
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::setter
       setter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
   setters
     static set setter=
       reference: <none>
-      enclosingElement: <testLibrary>
       metadata
         Annotation
           atSign: @ @16
@@ -7990,11 +7569,9 @@
       topLevelVariables
         const foo @6
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
         isNotConst @25
           reference: <testLibraryFragment>::@topLevelVariable::isNotConst
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @16
@@ -8007,7 +7584,6 @@
           setter2: <testLibraryFragment>::@setter::isNotConst
         const isConst @53
           reference: <testLibraryFragment>::@topLevelVariable::isConst
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @42
@@ -8020,56 +7596,45 @@
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
         get isNotConst @-1
           reference: <testLibraryFragment>::@getter::isNotConst
-          enclosingFragment: <testLibraryFragment>
         get isConst @-1
           reference: <testLibraryFragment>::@getter::isConst
-          enclosingFragment: <testLibraryFragment>
       setters
         set isNotConst= @-1
           reference: <testLibraryFragment>::@setter::isNotConst
-          enclosingFragment: <testLibraryFragment>
           parameters
             _isNotConst @-1
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
     isNotConst
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::isNotConst
       getter: <none>
       setter: <none>
     const isConst
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::isConst
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
     synthetic static get isNotConst
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::isNotConst
     synthetic static get isConst
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::isConst
   setters
     synthetic static set isNotConst=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _isNotConst
           reference: <none>
@@ -8138,25 +7703,21 @@
       topLevelVariables
         const a @37
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
     <testLibrary>::@fragment::package:test/foo.dart
       previousFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -8235,11 +7796,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
       constructors
         synthetic new
@@ -8490,11 +8049,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -8551,23 +8108,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -8637,11 +8190,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @29
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 x @34
                   metadata
@@ -8655,16 +8206,13 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -8689,14 +8237,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -8756,20 +8302,16 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::foo
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
       setters
         set foo= @21
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             x @32
               metadata
@@ -8783,25 +8325,21 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       setter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional x
           reference: <none>
@@ -8870,23 +8408,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -8968,27 +8502,22 @@
           constructors
             new @29
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @48
           reference: <testLibraryFragment>::@class::B
           constructors
             new @64
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -9000,7 +8529,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -9023,14 +8551,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -9090,11 +8616,9 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         v @23
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @16
@@ -9108,26 +8632,21 @@
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -9135,16 +8654,13 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -9217,20 +8733,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -9249,14 +8761,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -9354,7 +8864,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -9368,26 +8877,21 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
         class E @59
           reference: <testLibraryFragment>::@class::E
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::E
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           metadata
@@ -9407,7 +8911,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -9415,7 +8918,6 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
     class E
       reference: <testLibraryFragment>::@class::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::E
       constructors
         synthetic new
@@ -9424,14 +8926,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -9484,23 +8984,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -9554,23 +9050,19 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -9640,11 +9132,9 @@
       topLevelVariables
         const a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         x @20
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @13
@@ -9658,26 +9148,21 @@
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -9685,16 +9170,13 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -9775,31 +9257,25 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @45
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static const x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -9810,11 +9286,9 @@
       getters
         synthetic static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -9971,48 +9445,37 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       enums
         enum E @5
           reference: <testLibraryFragment>::@enum::E
           fields
             enumConstant a @8
               reference: <testLibraryFragment>::@enum::E::@field::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::a
             enumConstant b @11
               reference: <testLibraryFragment>::@enum::E::@field::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::b
             enumConstant c @14
               reference: <testLibraryFragment>::@enum::E::@field::c
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::c
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get a @-1
               reference: <testLibraryFragment>::@enum::E::@getter::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get b @-1
               reference: <testLibraryFragment>::@enum::E::@getter::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get c @-1
               reference: <testLibraryFragment>::@enum::E::@getter::c
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10021,31 +9484,26 @@
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::a
           getter: <none>
         static const b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::b
           getter: <none>
         static const c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::c
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -10056,19 +9514,15 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::b
         synthetic static get c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::c
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -10143,23 +9597,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       extensions
         extension E @10
           reference: <testLibraryFragment>::@extension::E
           fields
             x @36
               reference: <testLibraryFragment>::@extension::E::@field::x
-              enclosingFragment: <testLibraryFragment>::@extension::E
               getter2: <testLibraryFragment>::@extension::E::@getter::x
           getters
             get x @-1
               reference: <testLibraryFragment>::@extension::E::@getter::x
-              enclosingFragment: <testLibraryFragment>::@extension::E
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10168,19 +9618,16 @@
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E
       fields
         static const x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E
           type: int
           firstFragment: <testLibraryFragment>::@extension::E::@field::x
           getter: <none>
       getters
         synthetic static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::E
           firstFragment: <testLibraryFragment>::@extension::E::@getter::x
 ''');
   }
@@ -10266,11 +9713,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10339,17 +9784,14 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @43
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -10361,7 +9803,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10430,17 +9871,14 @@
           constructors
             const new @18
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @42
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         const new
@@ -10452,7 +9890,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10508,11 +9945,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10568,11 +10003,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10625,11 +10058,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10706,11 +10137,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10771,11 +10200,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10860,11 +10287,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10949,11 +10374,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -11009,11 +10432,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -11093,11 +10514,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -11142,11 +10561,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -11216,11 +10633,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -11268,11 +10683,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
diff --git a/pkg/analyzer/test/src/summary/elements/mixin_test.dart b/pkg/analyzer/test/src/summary/elements/mixin_test.dart
index fcac61c..5757458 100644
--- a/pkg/analyzer/test/src/summary/elements/mixin_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/mixin_test.dart
@@ -140,25 +140,21 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @17
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @28
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @39
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
       mixins
         mixin M @51
           reference: <testLibraryFragment>::@mixin::M
@@ -168,45 +164,36 @@
           fields
             f @101
               reference: <testLibraryFragment>::@mixin::M::@field::f
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::f
               setter2: <testLibraryFragment>::@mixin::M::@setter::f
             g @-1
               reference: <testLibraryFragment>::@mixin::M::@field::g
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::g
             s @-1
               reference: <testLibraryFragment>::@mixin::M::@field::s
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               setter2: <testLibraryFragment>::@mixin::M::@setter::s
           getters
             get f @-1
               reference: <testLibraryFragment>::@mixin::M::@getter::f
-              enclosingFragment: <testLibraryFragment>::@mixin::M
             get g @112
               reference: <testLibraryFragment>::@mixin::M::@getter::g
-              enclosingFragment: <testLibraryFragment>::@mixin::M
           setters
             set f= @-1
               reference: <testLibraryFragment>::@mixin::M::@setter::f
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               parameters
                 _f @-1
             set s= @126
               reference: <testLibraryFragment>::@mixin::M::@setter::s
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               parameters
                 v @132
           methods
             m @144
               reference: <testLibraryFragment>::@mixin::M::@method::m
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               parameters
                 v @153
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -214,7 +201,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -222,7 +208,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -230,7 +215,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -239,7 +223,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: num
@@ -251,36 +234,30 @@
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: T
           firstFragment: <testLibraryFragment>::@mixin::M::@field::f
           getter: <none>
           setter: <none>
         synthetic g
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: U
           firstFragment: <testLibraryFragment>::@mixin::M::@field::g
           getter: <none>
         synthetic s
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::s
           setter: <none>
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::f
         get g
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::g
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           parameters
             requiredPositional _f
               reference: <none>
@@ -288,7 +265,6 @@
           firstFragment: <testLibraryFragment>::@mixin::M::@setter::f
         set s=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           parameters
             requiredPositional v
               reference: <none>
@@ -333,7 +309,6 @@
   mixins
     base mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -380,30 +355,25 @@
           fields
             x @18
               reference: <testLibraryFragment>::@mixin::M::@field::x
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::x
           getters
             get x @-1
               reference: <testLibraryFragment>::@mixin::M::@getter::x
-              enclosingFragment: <testLibraryFragment>::@mixin::M
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::x
           getter: <none>
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::x
 ''');
   }
@@ -462,30 +432,25 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@mixin::M::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::foo
           getters
             get foo @25
               reference: <testLibraryFragment>::@mixin::M::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::foo
 ''');
   }
@@ -532,30 +497,25 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@mixin::M::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::foo
           getters
             get foo @25
               reference: <testLibraryFragment>::@mixin::M::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::foo
 ''');
   }
@@ -602,30 +562,25 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@mixin::M::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::foo
           getters
             get foo @25
               reference: <testLibraryFragment>::@mixin::M::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::foo
 ''');
   }
@@ -658,7 +613,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -724,13 +678,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @42
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: int}
@@ -742,7 +694,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -752,7 +703,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A<int>
       constructors
@@ -763,7 +713,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         U
       firstFragment: <testLibraryFragment>::@mixin::M
@@ -853,7 +802,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @20
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -861,7 +809,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -874,7 +821,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -888,7 +834,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -898,7 +843,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class alias B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -909,7 +853,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A<int>
       constructors
@@ -1022,7 +965,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A1
         class A2 @21
           reference: <testLibraryFragment>::@class::A2
           typeParameters
@@ -1030,7 +972,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A2::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A2
         class B @36
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -1038,7 +979,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -1051,13 +991,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::Base::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::Base
         class C @108
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -1069,7 +1007,6 @@
   classes
     class A1
       reference: <testLibraryFragment>::@class::A1
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A1
@@ -1079,7 +1016,6 @@
           firstFragment: <testLibraryFragment>::@class::A1::@constructor::new
     class A2
       reference: <testLibraryFragment>::@class::A2
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A2
@@ -1089,7 +1025,6 @@
           firstFragment: <testLibraryFragment>::@class::A2::@constructor::new
     class alias B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -1100,7 +1035,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class Base
       reference: <testLibraryFragment>::@class::Base
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::Base
       constructors
         synthetic new
@@ -1108,7 +1042,6 @@
           firstFragment: <testLibraryFragment>::@class::Base::@constructor::new
     class alias C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: Base
       constructors
@@ -1180,13 +1113,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @57
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: int Function(String)}
@@ -1199,7 +1130,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -1209,7 +1139,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A<int Function(String)>
       constructors
@@ -1220,7 +1149,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -1289,13 +1217,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class C @57
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: List<int>}
@@ -1307,7 +1233,6 @@
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -1317,7 +1242,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A<List<int>>
       constructors
@@ -1328,7 +1252,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::M
@@ -1414,13 +1337,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I
         class A @66
           reference: <testLibraryFragment>::@class::A
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -1443,7 +1364,6 @@
   classes
     class I
       reference: <testLibraryFragment>::@class::I
-      enclosingElement2: <testLibrary>
       typeParameters
         X
       firstFragment: <testLibraryFragment>::@class::I
@@ -1453,7 +1373,6 @@
           firstFragment: <testLibraryFragment>::@class::I::@constructor::new
     class alias A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       supertype: I<int>
       constructors
@@ -1464,7 +1383,6 @@
   mixins
     mixin M1
       reference: <testLibraryFragment>::@mixin::M1
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::M1
@@ -1472,7 +1390,6 @@
         I<T>
     mixin M2
       reference: <testLibraryFragment>::@mixin::M2
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::M2
@@ -1556,13 +1473,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::S::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::S
         class X @78
           reference: <testLibraryFragment>::@class::X
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::S::@constructor::new
                 substitution: {T3: String}
@@ -1575,7 +1490,6 @@
   classes
     class S
       reference: <testLibraryFragment>::@class::S
-      enclosingElement2: <testLibrary>
       typeParameters
         T3
       firstFragment: <testLibraryFragment>::@class::S
@@ -1585,7 +1499,6 @@
           firstFragment: <testLibraryFragment>::@class::S::@constructor::new
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       supertype: S<String>
       constructors
@@ -1596,7 +1509,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -1692,13 +1604,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::S::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::S
         class X @104
           reference: <testLibraryFragment>::@class::X
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::S::@constructor::new
                 substitution: {T4: String}
@@ -1711,7 +1621,6 @@
   classes
     class S
       reference: <testLibraryFragment>::@class::S
-      enclosingElement2: <testLibrary>
       typeParameters
         T4
       firstFragment: <testLibraryFragment>::@class::S
@@ -1721,7 +1630,6 @@
           firstFragment: <testLibraryFragment>::@class::S::@constructor::new
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       supertype: S<String>
       constructors
@@ -1732,7 +1640,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -1806,46 +1713,38 @@
           fields
             it @32
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
       mixins
         mixin M @56
           reference: <testLibraryFragment>::@mixin::M
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
   extensionTypes
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -1889,11 +1788,9 @@
           methods
             foo @22 invokesSuperSelf
               reference: <testLibraryFragment>::@mixin::M::@method::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -1948,18 +1845,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       mixins
         mixin B @17
           reference: <testLibraryFragment>::@mixin::B
           methods
             A @33
               reference: <testLibraryFragment>::@mixin::B::@method::A
-              enclosingFragment: <testLibraryFragment>::@mixin::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -1968,7 +1862,6 @@
   mixins
     mixin B
       reference: <testLibraryFragment>::@mixin::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::B
       superclassConstraints
         A
@@ -2024,32 +1917,27 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@mixin::M::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               setter2: <testLibraryFragment>::@mixin::M::@setter::foo
           setters
             set foo= @21
               reference: <testLibraryFragment>::@mixin::M::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               parameters
                 _ @29
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::foo
           setter: <none>
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           parameters
             requiredPositional _
               reference: <none>
@@ -2103,32 +1991,27 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@mixin::M::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               setter2: <testLibraryFragment>::@mixin::M::@setter::foo
           setters
             set foo= @21
               reference: <testLibraryFragment>::@mixin::M::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               parameters
                 _ @29
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::foo
           setter: <none>
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           parameters
             requiredPositional _
               reference: <none>
@@ -2199,46 +2082,38 @@
           fields
             it @32
               reference: <testLibraryFragment>::@extensionType::B::@field::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
               getter2: <testLibraryFragment>::@extensionType::B::@getter::it
           getters
             get it @-1
               reference: <testLibraryFragment>::@extensionType::B::@getter::it
-              enclosingFragment: <testLibraryFragment>::@extensionType::B
       mixins
         mixin M @56
           reference: <testLibraryFragment>::@mixin::M
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
   extensionTypes
     extension type B
       reference: <testLibraryFragment>::@extensionType::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extensionType::B
       typeErasure: int
       fields
         final it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           type: int
           firstFragment: <testLibraryFragment>::@extensionType::B::@field::it
           getter: <none>
       getters
         synthetic get it
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extensionType::B
           firstFragment: <testLibraryFragment>::@extensionType::B::@getter::it
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         A
@@ -2277,7 +2152,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::M
@@ -2317,7 +2191,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::M
@@ -2357,7 +2230,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::M
@@ -2403,7 +2275,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -2464,7 +2335,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       supertype: Object
       allSupertypes
@@ -2473,7 +2343,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -2540,13 +2409,11 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       allSupertypes
         Object
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: Object
       allSupertypes
@@ -2556,7 +2423,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         A
@@ -2663,7 +2529,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -2768,33 +2633,27 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0
           methods
             foo1 @47
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0
         class A @66
           reference: <testLibrary>::@fragment::package:test/a.dart::@class::A
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
           methods
             foo2 @77
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::A::@method::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
         class A @104
           reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1
           previousFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
           methods
             foo3 @115
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1::@method::foo3
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::1
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0
       constructors
         synthetic new
@@ -2806,7 +2665,6 @@
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@def::0::@method::foo1
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
       constructors
         synthetic new
@@ -2923,7 +2781,6 @@
           methods
             foo1 @61
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       mixins
@@ -2933,17 +2790,14 @@
           methods
             foo2 @43
               reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@method::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
   mixins
     mixin B
       reference: <testLibraryFragment>::@mixin::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::B
       superclassConstraints
         Object
     mixin A
       reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
       superclassConstraints
         Object
@@ -3058,18 +2912,15 @@
           fields
             foo @31
               reference: <testLibraryFragment>::@mixin::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@mixin::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@mixin::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -3081,19 +2932,16 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@field::foo
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo
           getter: <none>
@@ -3101,12 +2949,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -3248,18 +3094,15 @@
           fields
             foo @46
               reference: <testLibraryFragment>::@mixin::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@mixin::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@mixin::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -3273,7 +3116,6 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@field::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@fieldAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -3285,19 +3127,16 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@fieldAugmentation::foo
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo
           getter: <none>
@@ -3305,12 +3144,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -3452,19 +3289,16 @@
           fields
             foo @46
               reference: <testLibraryFragment>::@mixin::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@mixin::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@mixin::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -3478,7 +3312,6 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@getter::foo
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
@@ -3489,19 +3322,16 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@field::foo
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo
           getter: <none>
@@ -3509,12 +3339,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -3659,18 +3487,15 @@
           fields
             foo @46
               reference: <testLibraryFragment>::@mixin::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@mixin::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@mixin::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _foo @-1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setterAugmentation::foo
@@ -3685,7 +3510,6 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               parameters
                 _ @61
               previousFragment: <testLibraryFragment>::@mixin::A::@setter::foo
@@ -3698,19 +3522,16 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@field::foo
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo
           getter: <none>
@@ -3718,12 +3539,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -3833,18 +3652,15 @@
           fields
             foo @31
               reference: <testLibraryFragment>::@mixin::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@mixin::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@mixin::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -3856,19 +3672,16 @@
           fields
             foo @56
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@field::foo
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo
           getter: <none>
@@ -3876,12 +3689,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -3981,13 +3792,11 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@mixin::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo
           getters
             get foo @35
               reference: <testLibraryFragment>::@mixin::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       mixins
@@ -3997,26 +3806,22 @@
           fields
             foo @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@field::foo
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo
 ''');
   }
@@ -4141,17 +3946,14 @@
           fields
             foo1 @31
               reference: <testLibraryFragment>::@mixin::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo1
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo1
           getters
             get foo1 @-1
               reference: <testLibraryFragment>::@mixin::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
           setters
             set foo1= @-1
               reference: <testLibraryFragment>::@mixin::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _foo1 @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -4163,37 +3965,31 @@
           fields
             foo2 @45
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
               setter2: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setter::foo2
           getters
             get foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
           setters
             set foo2= @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               parameters
                 _foo2 @-1
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo1
           getter: <none>
           setter: <none>
         foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@field::foo2
           getter: <none>
@@ -4201,16 +3997,13 @@
       getters
         synthetic get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo1
         synthetic get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
       setters
         synthetic set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo1
               reference: <none>
@@ -4218,7 +4011,6 @@
           firstFragment: <testLibraryFragment>::@mixin::A::@setter::foo1
         synthetic set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo2
               reference: <none>
@@ -4359,17 +4151,14 @@
           fields
             foo1 @34
               reference: <testLibraryFragment>::@mixin::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo1
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo1
           getters
             get foo1 @-1
               reference: <testLibraryFragment>::@mixin::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
           setters
             set foo1= @-1
               reference: <testLibraryFragment>::@mixin::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _foo1 @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -4383,23 +4172,19 @@
           fields
             foo2 @48
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
               setter2: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setter::foo2
           getters
             get foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
           setters
             set foo2= @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               parameters
                 _foo2 @-1
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@mixin::A
@@ -4408,14 +4193,12 @@
       fields
         foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: T1
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo1
           getter: <none>
           setter: <none>
         foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: T2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@field::foo2
           getter: <none>
@@ -4423,16 +4206,13 @@
       getters
         synthetic get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo1
         synthetic get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
       setters
         synthetic set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo1
               reference: <none>
@@ -4440,7 +4220,6 @@
           firstFragment: <testLibraryFragment>::@mixin::A::@setter::foo1
         synthetic set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo2
               reference: <none>
@@ -4545,12 +4324,10 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@mixin::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo1
           getters
             get foo1 @35
               reference: <testLibraryFragment>::@mixin::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       mixins
@@ -4560,40 +4337,33 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
           getters
             get foo2 @49
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@field::foo2
           getter: <none>
       getters
         get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo1
         get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
 ''');
   }
@@ -4706,12 +4476,10 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@mixin::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo1
           getters
             get foo1 @38
               reference: <testLibraryFragment>::@mixin::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       mixins
@@ -4723,16 +4491,13 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
           getters
             get foo2 @52
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
       firstFragment: <testLibraryFragment>::@mixin::A
@@ -4741,24 +4506,20 @@
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: T1
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: T2
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@field::foo2
           getter: <none>
       getters
         abstract get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo1
         abstract get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getter::foo2
 ''');
   }
@@ -4864,18 +4625,15 @@
           fields
             foo @31
               reference: <testLibraryFragment>::@mixin::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@mixin::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@mixin::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -4887,19 +4645,16 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@getter::foo
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo
           getter: <none>
@@ -4907,12 +4662,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -5054,18 +4807,15 @@
           fields
             foo @46
               reference: <testLibraryFragment>::@mixin::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@mixin::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@mixin::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -5079,7 +4829,6 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -5091,19 +4840,16 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo
           getter: <none>
@@ -5111,12 +4857,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -5229,20 +4973,16 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@mixin::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo1
             foo2 @-1
               reference: <testLibraryFragment>::@mixin::A::@field::foo2
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo2
           getters
             get foo1 @35
               reference: <testLibraryFragment>::@mixin::A::@getter::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo1
             get foo2 @56
               reference: <testLibraryFragment>::@mixin::A::@getter::foo2
-              enclosingFragment: <testLibraryFragment>::@mixin::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       mixins
@@ -5252,36 +4992,30 @@
           getters
             augment get foo1 @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@getter::foo1
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo1
           getter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo2
           getter: <none>
       getters
         get foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo2
         get foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo1
 ''');
   }
@@ -5407,12 +5141,10 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@mixin::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo
           getters
             get foo @50
               reference: <testLibraryFragment>::@mixin::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
@@ -5425,7 +5157,6 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               previousFragment: <testLibraryFragment>::@mixin::A::@getter::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/b.dart
@@ -5437,26 +5168,22 @@
           getters
             augment get foo @57
               reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@getterAugmentation::foo
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo
 ''');
   }
@@ -5542,7 +5269,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
       mixins
         mixin A @21
           reference: <testLibraryFragment>::@mixin::A
@@ -5555,7 +5281,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       mixins
         mixin A @35
           reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
@@ -5563,7 +5288,6 @@
   classes
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -5571,7 +5295,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       constructors
         synthetic new
@@ -5580,7 +5303,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -5701,7 +5423,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
       mixins
         mixin A @21
           reference: <testLibraryFragment>::@mixin::A
@@ -5715,7 +5436,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       mixins
         mixin A @50
           reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
@@ -5729,7 +5449,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/b.dart::@class::I3::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@class::I3
       mixins
         mixin A @32
           reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
@@ -5737,7 +5456,6 @@
   classes
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -5745,7 +5463,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       constructors
         synthetic new
@@ -5753,7 +5470,6 @@
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
     class I3
       reference: <testLibrary>::@fragment::package:test/b.dart::@class::I3
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@class::I3
       constructors
         synthetic new
@@ -5762,7 +5478,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -5843,7 +5558,6 @@
           methods
             foo @32
               reference: <testLibraryFragment>::@mixin::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       mixins
@@ -5853,11 +5567,9 @@
           methods
             bar @46
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -5953,10 +5665,8 @@
             foo1 @32
               reference: <testLibraryFragment>::@mixin::A::@method::foo1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@methodAugmentation::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
             foo2 @49
               reference: <testLibraryFragment>::@mixin::A::@method::foo2
-              enclosingFragment: <testLibraryFragment>::@mixin::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       mixins
@@ -5967,11 +5677,9 @@
             augment foo1 @54
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@methodAugmentation::foo1
               previousFragment: <testLibraryFragment>::@mixin::A::@method::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -6091,7 +5799,6 @@
             foo @32
               reference: <testLibraryFragment>::@mixin::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       nextFragment: <testLibrary>::@fragment::package:test/b.dart
@@ -6105,7 +5812,6 @@
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@mixin::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       mixins
@@ -6116,11 +5822,9 @@
             augment foo @51
               reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -6215,7 +5919,6 @@
           methods
             foo @32
               reference: <testLibraryFragment>::@mixin::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       mixins
@@ -6227,11 +5930,9 @@
           methods
             bar @48
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@method::bar
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::A
@@ -6333,7 +6034,6 @@
             foo @32
               reference: <testLibraryFragment>::@mixin::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       mixins
@@ -6346,11 +6046,9 @@
             augment foo @56
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@mixin::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::A
@@ -6450,10 +6148,8 @@
             foo @32
               reference: <testLibraryFragment>::@mixin::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
             bar @48
               reference: <testLibraryFragment>::@mixin::A::@method::bar
-              enclosingFragment: <testLibraryFragment>::@mixin::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       mixins
@@ -6466,11 +6162,9 @@
             augment foo @57
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@mixin::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -6586,12 +6280,10 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@mixin::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo1
           setters
             set foo1= @31
               reference: <testLibraryFragment>::@mixin::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _ @40
     <testLibrary>::@fragment::package:test/a.dart
@@ -6603,38 +6295,32 @@
           fields
             foo2 @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@field::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               setter2: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setter::foo2
           setters
             set foo2= @45
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setter::foo2
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               parameters
                 _ @54
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo1
           setter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@field::foo2
           setter: <none>
       setters
         set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _
               reference: <none>
@@ -6642,7 +6328,6 @@
           firstFragment: <testLibraryFragment>::@mixin::A::@setter::foo1
         set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _
               reference: <none>
@@ -6755,17 +6440,14 @@
           fields
             foo @31
               reference: <testLibraryFragment>::@mixin::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               getter2: <testLibraryFragment>::@mixin::A::@getter::foo
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@mixin::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@mixin::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _foo @-1
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setterAugmentation::foo
@@ -6778,21 +6460,18 @@
           setters
             augment set foo= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               parameters
                 _ @61
               previousFragment: <testLibraryFragment>::@mixin::A::@setter::foo
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo
           getter: <none>
@@ -6800,12 +6479,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           firstFragment: <testLibraryFragment>::@mixin::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -6927,22 +6604,18 @@
           fields
             foo1 @-1
               reference: <testLibraryFragment>::@mixin::A::@field::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo1
             foo2 @-1
               reference: <testLibraryFragment>::@mixin::A::@field::foo2
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               setter2: <testLibraryFragment>::@mixin::A::@setter::foo2
           setters
             set foo1= @31
               reference: <testLibraryFragment>::@mixin::A::@setter::foo1
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _ @40
               nextFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setterAugmentation::foo1
             set foo2= @52
               reference: <testLibraryFragment>::@mixin::A::@setter::foo2
-              enclosingFragment: <testLibraryFragment>::@mixin::A
               parameters
                 _ @61
     <testLibrary>::@fragment::package:test/a.dart
@@ -6954,34 +6627,29 @@
           setters
             augment set foo1= @53
               reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A::@setterAugmentation::foo1
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
               parameters
                 _ @62
               previousFragment: <testLibraryFragment>::@mixin::A::@setter::foo1
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
       fields
         synthetic foo1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo1
           setter: <none>
         synthetic foo2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           type: int
           firstFragment: <testLibraryFragment>::@mixin::A::@field::foo2
           setter: <none>
       setters
         set foo2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _
               reference: <none>
@@ -6989,7 +6657,6 @@
           firstFragment: <testLibraryFragment>::@mixin::A::@setter::foo2
         set foo1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::A
           parameters
             requiredPositional _
               reference: <none>
@@ -7075,7 +6742,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B1
       mixins
         mixin A @21
           reference: <testLibraryFragment>::@mixin::A
@@ -7088,7 +6754,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::B2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B2
       mixins
         mixin A @35
           reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
@@ -7096,7 +6761,6 @@
   classes
     class B1
       reference: <testLibraryFragment>::@class::B1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B1
       constructors
         synthetic new
@@ -7104,7 +6768,6 @@
           firstFragment: <testLibraryFragment>::@class::B1::@constructor::new
     class B2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::B2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B2
       constructors
         synthetic new
@@ -7113,7 +6776,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         B1
@@ -7231,7 +6893,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
       mixins
         mixin A @21
           reference: <testLibraryFragment>::@mixin::A
@@ -7245,7 +6906,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       mixins
         mixin A @50
           reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
@@ -7259,7 +6919,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/b.dart::@class::I3::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@class::I3
       mixins
         mixin A @32
           reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::A
@@ -7267,7 +6926,6 @@
   classes
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -7275,7 +6933,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       constructors
         synthetic new
@@ -7283,7 +6940,6 @@
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
     class I3
       reference: <testLibrary>::@fragment::package:test/b.dart::@class::I3
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@class::I3
       constructors
         synthetic new
@@ -7292,7 +6948,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         I1
@@ -7372,7 +7027,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::B::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B
       mixins
         mixin A @35
           reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
@@ -7380,7 +7034,6 @@
   classes
     class B
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B
       constructors
         synthetic new
@@ -7389,7 +7042,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         B
@@ -7482,7 +7134,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I1
       mixins
         mixin A @21
           reference: <testLibraryFragment>::@mixin::A
@@ -7499,7 +7150,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
       mixins
         mixin A @35
           reference: <testLibrary>::@fragment::package:test/a.dart::@mixinAugmentation::A
@@ -7509,7 +7159,6 @@
   classes
     class I1
       reference: <testLibraryFragment>::@class::I1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I1
       constructors
         synthetic new
@@ -7517,7 +7166,6 @@
           firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
     class I2
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
@@ -7528,7 +7176,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::A
@@ -7625,16 +7272,13 @@
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
     class A
       reference: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@classAugmentation::A
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -7731,7 +7375,6 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       mixins
@@ -7741,7 +7384,6 @@
   classes
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
       constructors
         synthetic new
@@ -7750,7 +7392,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -7850,13 +7491,11 @@
           methods
             foo @41
               reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::B::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::B
               parameters
                 a @45
   mixins
     mixin B
       reference: <testLibraryFragment>::@mixin::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::B
       superclassConstraints
         A
@@ -7956,7 +7595,6 @@
           methods
             foo @28
               reference: <testLibraryFragment>::@mixin::B::@method::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::B
               parameters
                 a @32
     <testLibrary>::@fragment::package:test/b.dart
@@ -7970,7 +7608,6 @@
   mixins
     mixin B
       reference: <testLibraryFragment>::@mixin::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::B
       superclassConstraints
         Object
@@ -8066,7 +7703,6 @@
           methods
             foo @28
               reference: <testLibraryFragment>::@mixin::B::@method::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::B
               parameters
                 a @32
     <testLibrary>::@fragment::package:test/b.dart
@@ -8080,7 +7716,6 @@
   mixins
     mixin B
       reference: <testLibraryFragment>::@mixin::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::B
       superclassConstraints
         A
@@ -8195,7 +7830,6 @@
             foo @50
               reference: <testLibraryFragment>::@mixin::B::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::B::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::B
               parameters
                 a @54
     <testLibrary>::@fragment::package:test/b.dart
@@ -8208,13 +7842,11 @@
             augment foo @49
               reference: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::B::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@mixin::B::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/b.dart::@mixinAugmentation::B
               parameters
                 a @53
   mixins
     mixin B
       reference: <testLibraryFragment>::@mixin::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::B
       superclassConstraints
         A
@@ -8292,7 +7924,6 @@
   mixins
     base mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -8346,14 +7977,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I
       mixins
         mixin A @6
           reference: <testLibraryFragment>::@mixin::A
   classes
     class I
       reference: <testLibraryFragment>::@class::I
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I
       constructors
         synthetic new
@@ -8362,7 +7991,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -8412,14 +8040,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
       mixins
         mixin A @6
           reference: <testLibraryFragment>::@mixin::A
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -8428,7 +8054,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         B
@@ -8510,7 +8135,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: A<dynamic>
diff --git a/pkg/analyzer/test/src/summary/elements/non_synthetic_test.dart b/pkg/analyzer/test/src/summary/elements/non_synthetic_test.dart
index 0ac7a9b..d5e9254 100644
--- a/pkg/analyzer/test/src/summary/elements/non_synthetic_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/non_synthetic_test.dart
@@ -72,32 +72,26 @@
           fields
             foo @16
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo
               setter2: <testLibraryFragment>::@class::C::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::C::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::C::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _foo @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
@@ -109,12 +103,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _foo
               reference: <none>
@@ -169,25 +161,20 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get foo @20
               reference: <testLibraryFragment>::@class::C::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           getter: <none>
@@ -198,7 +185,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::foo
 ''');
   }
@@ -253,27 +239,22 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::C::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set foo= @16
               reference: <testLibraryFragment>::@class::C::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @24
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::foo
           setter: <none>
@@ -284,7 +265,6 @@
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -400,52 +380,41 @@
           fields
             enumConstant a @11
               reference: <testLibraryFragment>::@enum::E::@field::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::a
             enumConstant b @14
               reference: <testLibraryFragment>::@enum::E::@field::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::b
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get a @-1
               reference: <testLibraryFragment>::@enum::E::@getter::a
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get b @-1
               reference: <testLibraryFragment>::@enum::E::@getter::b
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::a
           getter: <none>
         static const b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::b
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -456,15 +425,12 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::b
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
 ''');
   }
@@ -522,30 +488,25 @@
           fields
             foo @16
               reference: <testLibraryFragment>::@mixin::M::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::foo
               setter2: <testLibraryFragment>::@mixin::M::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@mixin::M::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@mixin::M::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               parameters
                 _foo @-1
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::foo
           getter: <none>
@@ -553,12 +514,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           parameters
             requiredPositional _foo
               reference: <none>
@@ -610,30 +569,25 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@mixin::M::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               getter2: <testLibraryFragment>::@mixin::M::@getter::foo
           getters
             get foo @20
               reference: <testLibraryFragment>::@mixin::M::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           firstFragment: <testLibraryFragment>::@mixin::M::@getter::foo
 ''');
   }
@@ -685,32 +639,27 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@mixin::M::@field::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               setter2: <testLibraryFragment>::@mixin::M::@setter::foo
           setters
             set foo= @16
               reference: <testLibraryFragment>::@mixin::M::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@mixin::M
               parameters
                 value @24
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           type: int
           firstFragment: <testLibraryFragment>::@mixin::M::@field::foo
           setter: <none>
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@mixin::M
           parameters
             requiredPositional value
               reference: <none>
@@ -751,23 +700,19 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @8
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -814,23 +759,19 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
           setter2: <testLibraryFragment>::@setter::foo
       getters
         get foo @8
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
       setters
         set foo= @22
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             value @30
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
@@ -838,12 +779,10 @@
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional value
           reference: <none>
@@ -888,25 +827,21 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::foo
       setters
         set foo= @4
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             value @12
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       setter: <none>
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional value
           reference: <none>
@@ -957,23 +892,19 @@
       topLevelVariables
         foo @4
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
           setter2: <testLibraryFragment>::@setter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
       setters
         set foo= @-1
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             _foo @-1
   topLevelVariables
     foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
@@ -981,12 +912,10 @@
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
   setters
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
diff --git a/pkg/analyzer/test/src/summary/elements/offsets_test.dart b/pkg/analyzer/test/src/summary/elements/offsets_test.dart
index f5644b8..5b0f3b2 100644
--- a/pkg/analyzer/test/src/summary/elements/offsets_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/offsets_test.dart
@@ -164,41 +164,34 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::Raw::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::Raw
         class HasDocComment @50
           reference: <testLibraryFragment>::@class::HasDocComment
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::HasDocComment::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::HasDocComment
         class HasAnnotation @84
           reference: <testLibraryFragment>::@class::HasAnnotation
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::HasAnnotation::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::HasAnnotation
         class AnnotationThenComment @148
           reference: <testLibraryFragment>::@class::AnnotationThenComment
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::AnnotationThenComment::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::AnnotationThenComment
         class CommentThenAnnotation @220
           reference: <testLibraryFragment>::@class::CommentThenAnnotation
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::CommentThenAnnotation::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::CommentThenAnnotation
         class CommentAroundAnnotation @292
           reference: <testLibraryFragment>::@class::CommentAroundAnnotation
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::CommentAroundAnnotation::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::CommentAroundAnnotation
   classes
     class Raw
       reference: <testLibraryFragment>::@class::Raw
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 12
       firstFragment: <testLibraryFragment>::@class::Raw
@@ -208,7 +201,6 @@
           firstFragment: <testLibraryFragment>::@class::Raw::@constructor::new
     class HasDocComment
       reference: <testLibraryFragment>::@class::HasDocComment
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1.\n/// Comment 2.
       codeOffset: 14
       codeLength: 52
@@ -219,7 +211,6 @@
           firstFragment: <testLibraryFragment>::@class::HasDocComment::@constructor::new
     class HasAnnotation
       reference: <testLibraryFragment>::@class::HasAnnotation
-      enclosingElement2: <testLibrary>
       codeOffset: 68
       codeLength: 32
       firstFragment: <testLibraryFragment>::@class::HasAnnotation
@@ -229,7 +220,6 @@
           firstFragment: <testLibraryFragment>::@class::HasAnnotation::@constructor::new
     class AnnotationThenComment
       reference: <testLibraryFragment>::@class::AnnotationThenComment
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1.\n/// Comment 2.
       codeOffset: 102
       codeLength: 70
@@ -240,7 +230,6 @@
           firstFragment: <testLibraryFragment>::@class::AnnotationThenComment::@constructor::new
     class CommentThenAnnotation
       reference: <testLibraryFragment>::@class::CommentThenAnnotation
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1.\n/// Comment 2.
       codeOffset: 174
       codeLength: 70
@@ -251,7 +240,6 @@
           firstFragment: <testLibraryFragment>::@class::CommentThenAnnotation::@constructor::new
     class CommentAroundAnnotation
       reference: <testLibraryFragment>::@class::CommentAroundAnnotation
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 2.
       codeOffset: 261
       codeLength: 57
@@ -499,19 +487,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @18
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class Raw @30
           reference: <testLibraryFragment>::@class::Raw
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::Raw::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::Raw
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -524,7 +509,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::HasDocComment::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::HasDocComment
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -537,7 +521,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::HasAnnotation::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::HasAnnotation
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -550,7 +533,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::AnnotationThenComment::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::AnnotationThenComment
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -563,7 +545,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::CommentThenAnnotation::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::CommentThenAnnotation
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -576,7 +557,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::CommentAroundAnnotation::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::CommentAroundAnnotation
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -587,7 +567,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 10
       firstFragment: <testLibraryFragment>::@class::A
@@ -597,7 +576,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       codeOffset: 12
       codeLength: 10
       firstFragment: <testLibraryFragment>::@class::B
@@ -607,7 +585,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class alias Raw
       reference: <testLibraryFragment>::@class::Raw
-      enclosingElement2: <testLibrary>
       codeOffset: 24
       codeLength: 29
       firstFragment: <testLibraryFragment>::@class::Raw
@@ -618,7 +595,6 @@
           firstFragment: <testLibraryFragment>::@class::Raw::@constructor::new
     class alias HasDocComment
       reference: <testLibraryFragment>::@class::HasDocComment
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1.\n/// Comment 2.
       codeOffset: 55
       codeLength: 69
@@ -630,7 +606,6 @@
           firstFragment: <testLibraryFragment>::@class::HasDocComment::@constructor::new
     class alias HasAnnotation
       reference: <testLibraryFragment>::@class::HasAnnotation
-      enclosingElement2: <testLibrary>
       codeOffset: 126
       codeLength: 49
       firstFragment: <testLibraryFragment>::@class::HasAnnotation
@@ -641,7 +616,6 @@
           firstFragment: <testLibraryFragment>::@class::HasAnnotation::@constructor::new
     class alias AnnotationThenComment
       reference: <testLibraryFragment>::@class::AnnotationThenComment
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1.\n/// Comment 2.
       codeOffset: 177
       codeLength: 87
@@ -653,7 +627,6 @@
           firstFragment: <testLibraryFragment>::@class::AnnotationThenComment::@constructor::new
     class alias CommentThenAnnotation
       reference: <testLibraryFragment>::@class::CommentThenAnnotation
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1.\n/// Comment 2.
       codeOffset: 266
       codeLength: 87
@@ -665,7 +638,6 @@
           firstFragment: <testLibraryFragment>::@class::CommentThenAnnotation::@constructor::new
     class alias CommentAroundAnnotation
       reference: <testLibraryFragment>::@class::CommentAroundAnnotation
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 2.
       codeOffset: 370
       codeLength: 74
@@ -829,19 +801,16 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               codeOffset: 12
               codeLength: 4
             raw @22
               reference: <testLibraryFragment>::@class::C::@constructor::raw
-              enclosingFragment: <testLibraryFragment>::@class::C
               codeOffset: 20
               codeLength: 10
               periodOffset: 21
               nameEnd: 25
             hasDocComment @70
               reference: <testLibraryFragment>::@class::C::@constructor::hasDocComment
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 1.\n/// Comment 2.
               codeOffset: 34
               codeLength: 54
@@ -849,7 +818,6 @@
               nameEnd: 83
             hasAnnotation @106
               reference: <testLibraryFragment>::@class::C::@constructor::hasAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               metadata
                 Annotation
                   atSign: @ @92
@@ -867,7 +835,6 @@
               nameEnd: 119
             annotationThenComment @176
               reference: <testLibraryFragment>::@class::C::@constructor::annotationThenComment
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 1.\n/// Comment 2.
               metadata
                 Annotation
@@ -886,7 +853,6 @@
               nameEnd: 197
             commentThenAnnotation @254
               reference: <testLibraryFragment>::@class::C::@constructor::commentThenAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 1.\n/// Comment 2.
               metadata
                 Annotation
@@ -905,7 +871,6 @@
               nameEnd: 275
             commentAroundAnnotation @332
               reference: <testLibraryFragment>::@class::C::@constructor::commentAroundAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 2.
               metadata
                 Annotation
@@ -925,7 +890,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 362
       firstFragment: <testLibraryFragment>::@class::C
@@ -1153,19 +1117,16 @@
           constructors
             factory new @20
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               codeOffset: 12
               codeLength: 23
             factory raw @49
               reference: <testLibraryFragment>::@class::C::@constructor::raw
-              enclosingFragment: <testLibraryFragment>::@class::C
               codeOffset: 39
               codeLength: 27
               periodOffset: 48
               nameEnd: 52
             factory hasDocComment @114
               reference: <testLibraryFragment>::@class::C::@constructor::hasDocComment
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 1.\n/// Comment 2.
               codeOffset: 70
               codeLength: 71
@@ -1173,7 +1134,6 @@
               nameEnd: 127
             factory hasAnnotation @167
               reference: <testLibraryFragment>::@class::C::@constructor::hasAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               metadata
                 Annotation
                   atSign: @ @145
@@ -1191,7 +1151,6 @@
               nameEnd: 180
             factory annotationThenComment @254
               reference: <testLibraryFragment>::@class::C::@constructor::annotationThenComment
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 1.\n/// Comment 2.
               metadata
                 Annotation
@@ -1210,7 +1169,6 @@
               nameEnd: 275
             factory commentThenAnnotation @349
               reference: <testLibraryFragment>::@class::C::@constructor::commentThenAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 1.\n/// Comment 2.
               metadata
                 Annotation
@@ -1229,7 +1187,6 @@
               nameEnd: 370
             factory commentAroundAnnotation @444
               reference: <testLibraryFragment>::@class::C::@constructor::commentAroundAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 2.
               metadata
                 Annotation
@@ -1249,7 +1206,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 483
       firstFragment: <testLibraryFragment>::@class::C
@@ -1468,7 +1424,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       extensions
         extension Raw @22
           reference: <testLibraryFragment>::@extension::Raw
@@ -1485,7 +1440,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 10
       firstFragment: <testLibraryFragment>::@class::A
@@ -1496,40 +1450,34 @@
   extensions
     extension Raw
       reference: <testLibraryFragment>::@extension::Raw
-      enclosingElement2: <testLibrary>
       codeOffset: 12
       codeLength: 21
       firstFragment: <testLibraryFragment>::@extension::Raw
     extension HasDocComment
       reference: <testLibraryFragment>::@extension::HasDocComment
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1.\n/// Comment 2.
       codeOffset: 35
       codeLength: 61
       firstFragment: <testLibraryFragment>::@extension::HasDocComment
     extension HasAnnotation
       reference: <testLibraryFragment>::@extension::HasAnnotation
-      enclosingElement2: <testLibrary>
       codeOffset: 98
       codeLength: 41
       firstFragment: <testLibraryFragment>::@extension::HasAnnotation
     extension AnnotationThenComment
       reference: <testLibraryFragment>::@extension::AnnotationThenComment
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1.\n/// Comment 2.
       codeOffset: 141
       codeLength: 79
       firstFragment: <testLibraryFragment>::@extension::AnnotationThenComment
     extension CommentThenAnnotation
       reference: <testLibraryFragment>::@extension::CommentThenAnnotation
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 1.\n/// Comment 2.
       codeOffset: 222
       codeLength: 79
       firstFragment: <testLibraryFragment>::@extension::CommentThenAnnotation
     extension CommentAroundAnnotation
       reference: <testLibraryFragment>::@extension::CommentAroundAnnotation
-      enclosingElement2: <testLibrary>
       documentationComment: /// Comment 2.
       codeOffset: 318
       codeLength: 66
@@ -1666,114 +1614,92 @@
           fields
             withInit @16
               reference: <testLibraryFragment>::@class::C::@field::withInit
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::withInit
               setter2: <testLibraryFragment>::@class::C::@setter::withInit
             withoutInit @37
               reference: <testLibraryFragment>::@class::C::@field::withoutInit
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::withoutInit
               setter2: <testLibraryFragment>::@class::C::@setter::withoutInit
             multiWithInit @57
               reference: <testLibraryFragment>::@class::C::@field::multiWithInit
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::multiWithInit
               setter2: <testLibraryFragment>::@class::C::@setter::multiWithInit
             multiWithoutInit @76
               reference: <testLibraryFragment>::@class::C::@field::multiWithoutInit
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::multiWithoutInit
               setter2: <testLibraryFragment>::@class::C::@setter::multiWithoutInit
             multiWithInit2 @94
               reference: <testLibraryFragment>::@class::C::@field::multiWithInit2
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::multiWithInit2
               setter2: <testLibraryFragment>::@class::C::@setter::multiWithInit2
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get withInit @-1
               reference: <testLibraryFragment>::@class::C::@getter::withInit
-              enclosingFragment: <testLibraryFragment>::@class::C
             get withoutInit @-1
               reference: <testLibraryFragment>::@class::C::@getter::withoutInit
-              enclosingFragment: <testLibraryFragment>::@class::C
             get multiWithInit @-1
               reference: <testLibraryFragment>::@class::C::@getter::multiWithInit
-              enclosingFragment: <testLibraryFragment>::@class::C
             get multiWithoutInit @-1
               reference: <testLibraryFragment>::@class::C::@getter::multiWithoutInit
-              enclosingFragment: <testLibraryFragment>::@class::C
             get multiWithInit2 @-1
               reference: <testLibraryFragment>::@class::C::@getter::multiWithInit2
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set withInit= @-1
               reference: <testLibraryFragment>::@class::C::@setter::withInit
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _withInit @-1
             set withoutInit= @-1
               reference: <testLibraryFragment>::@class::C::@setter::withoutInit
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _withoutInit @-1
             set multiWithInit= @-1
               reference: <testLibraryFragment>::@class::C::@setter::multiWithInit
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _multiWithInit @-1
             set multiWithoutInit= @-1
               reference: <testLibraryFragment>::@class::C::@setter::multiWithoutInit
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _multiWithoutInit @-1
             set multiWithInit2= @-1
               reference: <testLibraryFragment>::@class::C::@setter::multiWithInit2
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _multiWithInit2 @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 115
       firstFragment: <testLibraryFragment>::@class::C
       fields
         withInit
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::withInit
           getter: <none>
           setter: <none>
         withoutInit
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::withoutInit
           getter: <none>
           setter: <none>
         multiWithInit
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::multiWithInit
           getter: <none>
           setter: <none>
         multiWithoutInit
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::multiWithoutInit
           getter: <none>
           setter: <none>
         multiWithInit2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::multiWithInit2
           getter: <none>
@@ -1785,28 +1711,22 @@
       getters
         synthetic get withInit
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::withInit
         synthetic get withoutInit
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::withoutInit
         synthetic get multiWithInit
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::multiWithInit
         synthetic get multiWithoutInit
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::multiWithoutInit
         synthetic get multiWithInit2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::multiWithInit2
       setters
         synthetic set withInit=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _withInit
               reference: <none>
@@ -1814,7 +1734,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::withInit
         synthetic set withoutInit=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _withoutInit
               reference: <none>
@@ -1822,7 +1741,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::withoutInit
         synthetic set multiWithInit=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _multiWithInit
               reference: <none>
@@ -1830,7 +1748,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::multiWithInit
         synthetic set multiWithoutInit=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _multiWithoutInit
               reference: <none>
@@ -1838,7 +1755,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::multiWithoutInit
         synthetic set multiWithInit2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _multiWithInit2
               reference: <none>
@@ -2170,214 +2086,172 @@
           fields
             hasDocComment @50
               reference: <testLibraryFragment>::@class::C::@field::hasDocComment
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::hasDocComment
               setter2: <testLibraryFragment>::@class::C::@setter::hasDocComment
             hasDocComment2 @65
               reference: <testLibraryFragment>::@class::C::@field::hasDocComment2
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::hasDocComment2
               setter2: <testLibraryFragment>::@class::C::@setter::hasDocComment2
             hasAnnotation @100
               reference: <testLibraryFragment>::@class::C::@field::hasAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::hasAnnotation
               setter2: <testLibraryFragment>::@class::C::@setter::hasAnnotation
             hasAnnotation2 @115
               reference: <testLibraryFragment>::@class::C::@field::hasAnnotation2
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::hasAnnotation2
               setter2: <testLibraryFragment>::@class::C::@setter::hasAnnotation2
             annotationThenComment @184
               reference: <testLibraryFragment>::@class::C::@field::annotationThenComment
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::annotationThenComment
               setter2: <testLibraryFragment>::@class::C::@setter::annotationThenComment
             annotationThenComment2 @207
               reference: <testLibraryFragment>::@class::C::@field::annotationThenComment2
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::annotationThenComment2
               setter2: <testLibraryFragment>::@class::C::@setter::annotationThenComment2
             commentThenAnnotation @284
               reference: <testLibraryFragment>::@class::C::@field::commentThenAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::commentThenAnnotation
               setter2: <testLibraryFragment>::@class::C::@setter::commentThenAnnotation
             commentThenAnnotation2 @307
               reference: <testLibraryFragment>::@class::C::@field::commentThenAnnotation2
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::commentThenAnnotation2
               setter2: <testLibraryFragment>::@class::C::@setter::commentThenAnnotation2
             commentAroundAnnotation @384
               reference: <testLibraryFragment>::@class::C::@field::commentAroundAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::commentAroundAnnotation
               setter2: <testLibraryFragment>::@class::C::@setter::commentAroundAnnotation
             commentAroundAnnotation2 @409
               reference: <testLibraryFragment>::@class::C::@field::commentAroundAnnotation2
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::commentAroundAnnotation2
               setter2: <testLibraryFragment>::@class::C::@setter::commentAroundAnnotation2
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get hasDocComment @-1
               reference: <testLibraryFragment>::@class::C::@getter::hasDocComment
-              enclosingFragment: <testLibraryFragment>::@class::C
             get hasDocComment2 @-1
               reference: <testLibraryFragment>::@class::C::@getter::hasDocComment2
-              enclosingFragment: <testLibraryFragment>::@class::C
             get hasAnnotation @-1
               reference: <testLibraryFragment>::@class::C::@getter::hasAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
             get hasAnnotation2 @-1
               reference: <testLibraryFragment>::@class::C::@getter::hasAnnotation2
-              enclosingFragment: <testLibraryFragment>::@class::C
             get annotationThenComment @-1
               reference: <testLibraryFragment>::@class::C::@getter::annotationThenComment
-              enclosingFragment: <testLibraryFragment>::@class::C
             get annotationThenComment2 @-1
               reference: <testLibraryFragment>::@class::C::@getter::annotationThenComment2
-              enclosingFragment: <testLibraryFragment>::@class::C
             get commentThenAnnotation @-1
               reference: <testLibraryFragment>::@class::C::@getter::commentThenAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
             get commentThenAnnotation2 @-1
               reference: <testLibraryFragment>::@class::C::@getter::commentThenAnnotation2
-              enclosingFragment: <testLibraryFragment>::@class::C
             get commentAroundAnnotation @-1
               reference: <testLibraryFragment>::@class::C::@getter::commentAroundAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
             get commentAroundAnnotation2 @-1
               reference: <testLibraryFragment>::@class::C::@getter::commentAroundAnnotation2
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set hasDocComment= @-1
               reference: <testLibraryFragment>::@class::C::@setter::hasDocComment
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _hasDocComment @-1
             set hasDocComment2= @-1
               reference: <testLibraryFragment>::@class::C::@setter::hasDocComment2
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _hasDocComment2 @-1
             set hasAnnotation= @-1
               reference: <testLibraryFragment>::@class::C::@setter::hasAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _hasAnnotation @-1
             set hasAnnotation2= @-1
               reference: <testLibraryFragment>::@class::C::@setter::hasAnnotation2
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _hasAnnotation2 @-1
             set annotationThenComment= @-1
               reference: <testLibraryFragment>::@class::C::@setter::annotationThenComment
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _annotationThenComment @-1
             set annotationThenComment2= @-1
               reference: <testLibraryFragment>::@class::C::@setter::annotationThenComment2
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _annotationThenComment2 @-1
             set commentThenAnnotation= @-1
               reference: <testLibraryFragment>::@class::C::@setter::commentThenAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _commentThenAnnotation @-1
             set commentThenAnnotation2= @-1
               reference: <testLibraryFragment>::@class::C::@setter::commentThenAnnotation2
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _commentThenAnnotation2 @-1
             set commentAroundAnnotation= @-1
               reference: <testLibraryFragment>::@class::C::@setter::commentAroundAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _commentAroundAnnotation @-1
             set commentAroundAnnotation2= @-1
               reference: <testLibraryFragment>::@class::C::@setter::commentAroundAnnotation2
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _commentAroundAnnotation2 @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 436
       firstFragment: <testLibraryFragment>::@class::C
       fields
         hasDocComment
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::hasDocComment
           getter: <none>
           setter: <none>
         hasDocComment2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::hasDocComment2
           getter: <none>
           setter: <none>
         hasAnnotation
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::hasAnnotation
           getter: <none>
           setter: <none>
         hasAnnotation2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::hasAnnotation2
           getter: <none>
           setter: <none>
         annotationThenComment
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::annotationThenComment
           getter: <none>
           setter: <none>
         annotationThenComment2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::annotationThenComment2
           getter: <none>
           setter: <none>
         commentThenAnnotation
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::commentThenAnnotation
           getter: <none>
           setter: <none>
         commentThenAnnotation2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::commentThenAnnotation2
           getter: <none>
           setter: <none>
         commentAroundAnnotation
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::commentAroundAnnotation
           getter: <none>
           setter: <none>
         commentAroundAnnotation2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::commentAroundAnnotation2
           getter: <none>
@@ -2389,48 +2263,37 @@
       getters
         synthetic get hasDocComment
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::hasDocComment
         synthetic get hasDocComment2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::hasDocComment2
         synthetic get hasAnnotation
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::hasAnnotation
         synthetic get hasAnnotation2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::hasAnnotation2
         synthetic get annotationThenComment
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::annotationThenComment
         synthetic get annotationThenComment2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::annotationThenComment2
         synthetic get commentThenAnnotation
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::commentThenAnnotation
         synthetic get commentThenAnnotation2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::commentThenAnnotation2
         synthetic get commentAroundAnnotation
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::commentAroundAnnotation
         synthetic get commentAroundAnnotation2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::commentAroundAnnotation2
       setters
         synthetic set hasDocComment=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _hasDocComment
               reference: <none>
@@ -2438,7 +2301,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::hasDocComment
         synthetic set hasDocComment2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _hasDocComment2
               reference: <none>
@@ -2446,7 +2308,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::hasDocComment2
         synthetic set hasAnnotation=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _hasAnnotation
               reference: <none>
@@ -2454,7 +2315,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::hasAnnotation
         synthetic set hasAnnotation2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _hasAnnotation2
               reference: <none>
@@ -2462,7 +2322,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::hasAnnotation2
         synthetic set annotationThenComment=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _annotationThenComment
               reference: <none>
@@ -2470,7 +2329,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::annotationThenComment
         synthetic set annotationThenComment2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _annotationThenComment2
               reference: <none>
@@ -2478,7 +2336,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::annotationThenComment2
         synthetic set commentThenAnnotation=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _commentThenAnnotation
               reference: <none>
@@ -2486,7 +2343,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::commentThenAnnotation
         synthetic set commentThenAnnotation2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _commentThenAnnotation2
               reference: <none>
@@ -2494,7 +2350,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::commentThenAnnotation2
         synthetic set commentAroundAnnotation=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _commentAroundAnnotation
               reference: <none>
@@ -2502,7 +2357,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::commentAroundAnnotation
         synthetic set commentAroundAnnotation2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _commentAroundAnnotation2
               reference: <none>
@@ -2780,22 +2634,18 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             raw @17
               reference: <testLibraryFragment>::@class::C::@method::raw
-              enclosingFragment: <testLibraryFragment>::@class::C
               codeOffset: 12
               codeLength: 13
             hasDocComment @68
               reference: <testLibraryFragment>::@class::C::@method::hasDocComment
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 1.\n/// Comment 2.
               codeOffset: 29
               codeLength: 57
             hasAnnotation @107
               reference: <testLibraryFragment>::@class::C::@method::hasAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               metadata
                 Annotation
                   atSign: @ @90
@@ -2811,7 +2661,6 @@
               codeLength: 35
             annotationThenComment @180
               reference: <testLibraryFragment>::@class::C::@method::annotationThenComment
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 1.\n/// Comment 2.
               metadata
                 Annotation
@@ -2828,7 +2677,6 @@
               codeLength: 77
             commentThenAnnotation @261
               reference: <testLibraryFragment>::@class::C::@method::commentThenAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 1.\n/// Comment 2.
               metadata
                 Annotation
@@ -2845,7 +2693,6 @@
               codeLength: 77
             commentAroundAnnotation @342
               reference: <testLibraryFragment>::@class::C::@method::commentAroundAnnotation
-              enclosingFragment: <testLibraryFragment>::@class::C
               documentationComment: /// Comment 2.
               metadata
                 Annotation
@@ -2863,7 +2710,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 372
       firstFragment: <testLibraryFragment>::@class::C
@@ -3168,103 +3014,83 @@
       topLevelVariables
         withInit @4
           reference: <testLibraryFragment>::@topLevelVariable::withInit
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::withInit
           setter2: <testLibraryFragment>::@setter::withInit
         withoutInit @31
           reference: <testLibraryFragment>::@topLevelVariable::withoutInit
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::withoutInit
           setter2: <testLibraryFragment>::@setter::withoutInit
         multiWithInit @49
           reference: <testLibraryFragment>::@topLevelVariable::multiWithInit
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::multiWithInit
           setter2: <testLibraryFragment>::@setter::multiWithInit
         multiWithoutInit @68
           reference: <testLibraryFragment>::@topLevelVariable::multiWithoutInit
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::multiWithoutInit
           setter2: <testLibraryFragment>::@setter::multiWithoutInit
         multiWithInit2 @86
           reference: <testLibraryFragment>::@topLevelVariable::multiWithInit2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::multiWithInit2
           setter2: <testLibraryFragment>::@setter::multiWithInit2
       getters
         get withInit @-1
           reference: <testLibraryFragment>::@getter::withInit
-          enclosingFragment: <testLibraryFragment>
         get withoutInit @-1
           reference: <testLibraryFragment>::@getter::withoutInit
-          enclosingFragment: <testLibraryFragment>
         get multiWithInit @-1
           reference: <testLibraryFragment>::@getter::multiWithInit
-          enclosingFragment: <testLibraryFragment>
         get multiWithoutInit @-1
           reference: <testLibraryFragment>::@getter::multiWithoutInit
-          enclosingFragment: <testLibraryFragment>
         get multiWithInit2 @-1
           reference: <testLibraryFragment>::@getter::multiWithInit2
-          enclosingFragment: <testLibraryFragment>
       setters
         set withInit= @-1
           reference: <testLibraryFragment>::@setter::withInit
-          enclosingFragment: <testLibraryFragment>
           parameters
             _withInit @-1
         set withoutInit= @-1
           reference: <testLibraryFragment>::@setter::withoutInit
-          enclosingFragment: <testLibraryFragment>
           parameters
             _withoutInit @-1
         set multiWithInit= @-1
           reference: <testLibraryFragment>::@setter::multiWithInit
-          enclosingFragment: <testLibraryFragment>
           parameters
             _multiWithInit @-1
         set multiWithoutInit= @-1
           reference: <testLibraryFragment>::@setter::multiWithoutInit
-          enclosingFragment: <testLibraryFragment>
           parameters
             _multiWithoutInit @-1
         set multiWithInit2= @-1
           reference: <testLibraryFragment>::@setter::multiWithInit2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _multiWithInit2 @-1
   topLevelVariables
     withInit
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::withInit
       getter: <none>
       setter: <none>
     withoutInit
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::withoutInit
       getter: <none>
       setter: <none>
     multiWithInit
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::multiWithInit
       getter: <none>
       setter: <none>
     multiWithoutInit
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::multiWithoutInit
       getter: <none>
       setter: <none>
     multiWithInit2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::multiWithInit2
       getter: <none>
@@ -3272,28 +3098,22 @@
   getters
     synthetic static get withInit
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::withInit
     synthetic static get withoutInit
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::withoutInit
     synthetic static get multiWithInit
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::multiWithInit
     synthetic static get multiWithoutInit
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::multiWithoutInit
     synthetic static get multiWithInit2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::multiWithInit2
   setters
     synthetic static set withInit=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _withInit
           reference: <none>
@@ -3301,7 +3121,6 @@
       firstFragment: <testLibraryFragment>::@setter::withInit
     synthetic static set withoutInit=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _withoutInit
           reference: <none>
@@ -3309,7 +3128,6 @@
       firstFragment: <testLibraryFragment>::@setter::withoutInit
     synthetic static set multiWithInit=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _multiWithInit
           reference: <none>
@@ -3317,7 +3135,6 @@
       firstFragment: <testLibraryFragment>::@setter::multiWithInit
     synthetic static set multiWithoutInit=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _multiWithoutInit
           reference: <none>
@@ -3325,7 +3142,6 @@
       firstFragment: <testLibraryFragment>::@setter::multiWithoutInit
     synthetic static set multiWithInit2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _multiWithInit2
           reference: <none>
@@ -3642,19 +3458,16 @@
       topLevelVariables
         hasDocComment @34
           reference: <testLibraryFragment>::@topLevelVariable::hasDocComment
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /// Comment 1.\n/// Comment 2.
           getter2: <testLibraryFragment>::@getter::hasDocComment
           setter2: <testLibraryFragment>::@setter::hasDocComment
         hasDocComment2 @49
           reference: <testLibraryFragment>::@topLevelVariable::hasDocComment2
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /// Comment 1.\n/// Comment 2.
           getter2: <testLibraryFragment>::@getter::hasDocComment2
           setter2: <testLibraryFragment>::@setter::hasDocComment2
         hasAnnotation @80
           reference: <testLibraryFragment>::@topLevelVariable::hasAnnotation
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @66
@@ -3670,7 +3483,6 @@
           setter2: <testLibraryFragment>::@setter::hasAnnotation
         hasAnnotation2 @95
           reference: <testLibraryFragment>::@topLevelVariable::hasAnnotation2
-          enclosingFragment: <testLibraryFragment>
           metadata
             Annotation
               atSign: @ @66
@@ -3686,7 +3498,6 @@
           setter2: <testLibraryFragment>::@setter::hasAnnotation2
         annotationThenComment @156
           reference: <testLibraryFragment>::@topLevelVariable::annotationThenComment
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /// Comment 1.\n/// Comment 2.
           metadata
             Annotation
@@ -3703,7 +3514,6 @@
           setter2: <testLibraryFragment>::@setter::annotationThenComment
         annotationThenComment2 @179
           reference: <testLibraryFragment>::@topLevelVariable::annotationThenComment2
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /// Comment 1.\n/// Comment 2.
           metadata
             Annotation
@@ -3720,7 +3530,6 @@
           setter2: <testLibraryFragment>::@setter::annotationThenComment2
         commentThenAnnotation @248
           reference: <testLibraryFragment>::@topLevelVariable::commentThenAnnotation
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /// Comment 1.\n/// Comment 2.
           metadata
             Annotation
@@ -3737,7 +3546,6 @@
           setter2: <testLibraryFragment>::@setter::commentThenAnnotation
         commentThenAnnotation2 @271
           reference: <testLibraryFragment>::@topLevelVariable::commentThenAnnotation2
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /// Comment 1.\n/// Comment 2.
           metadata
             Annotation
@@ -3754,7 +3562,6 @@
           setter2: <testLibraryFragment>::@setter::commentThenAnnotation2
         commentAroundAnnotation @340
           reference: <testLibraryFragment>::@topLevelVariable::commentAroundAnnotation
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /// Comment 2.
           metadata
             Annotation
@@ -3771,7 +3578,6 @@
           setter2: <testLibraryFragment>::@setter::commentAroundAnnotation
         commentAroundAnnotation2 @365
           reference: <testLibraryFragment>::@topLevelVariable::commentAroundAnnotation2
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /// Comment 2.
           metadata
             Annotation
@@ -3789,152 +3595,122 @@
       getters
         get hasDocComment @-1
           reference: <testLibraryFragment>::@getter::hasDocComment
-          enclosingFragment: <testLibraryFragment>
         get hasDocComment2 @-1
           reference: <testLibraryFragment>::@getter::hasDocComment2
-          enclosingFragment: <testLibraryFragment>
         get hasAnnotation @-1
           reference: <testLibraryFragment>::@getter::hasAnnotation
-          enclosingFragment: <testLibraryFragment>
         get hasAnnotation2 @-1
           reference: <testLibraryFragment>::@getter::hasAnnotation2
-          enclosingFragment: <testLibraryFragment>
         get annotationThenComment @-1
           reference: <testLibraryFragment>::@getter::annotationThenComment
-          enclosingFragment: <testLibraryFragment>
         get annotationThenComment2 @-1
           reference: <testLibraryFragment>::@getter::annotationThenComment2
-          enclosingFragment: <testLibraryFragment>
         get commentThenAnnotation @-1
           reference: <testLibraryFragment>::@getter::commentThenAnnotation
-          enclosingFragment: <testLibraryFragment>
         get commentThenAnnotation2 @-1
           reference: <testLibraryFragment>::@getter::commentThenAnnotation2
-          enclosingFragment: <testLibraryFragment>
         get commentAroundAnnotation @-1
           reference: <testLibraryFragment>::@getter::commentAroundAnnotation
-          enclosingFragment: <testLibraryFragment>
         get commentAroundAnnotation2 @-1
           reference: <testLibraryFragment>::@getter::commentAroundAnnotation2
-          enclosingFragment: <testLibraryFragment>
       setters
         set hasDocComment= @-1
           reference: <testLibraryFragment>::@setter::hasDocComment
-          enclosingFragment: <testLibraryFragment>
           parameters
             _hasDocComment @-1
         set hasDocComment2= @-1
           reference: <testLibraryFragment>::@setter::hasDocComment2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _hasDocComment2 @-1
         set hasAnnotation= @-1
           reference: <testLibraryFragment>::@setter::hasAnnotation
-          enclosingFragment: <testLibraryFragment>
           parameters
             _hasAnnotation @-1
         set hasAnnotation2= @-1
           reference: <testLibraryFragment>::@setter::hasAnnotation2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _hasAnnotation2 @-1
         set annotationThenComment= @-1
           reference: <testLibraryFragment>::@setter::annotationThenComment
-          enclosingFragment: <testLibraryFragment>
           parameters
             _annotationThenComment @-1
         set annotationThenComment2= @-1
           reference: <testLibraryFragment>::@setter::annotationThenComment2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _annotationThenComment2 @-1
         set commentThenAnnotation= @-1
           reference: <testLibraryFragment>::@setter::commentThenAnnotation
-          enclosingFragment: <testLibraryFragment>
           parameters
             _commentThenAnnotation @-1
         set commentThenAnnotation2= @-1
           reference: <testLibraryFragment>::@setter::commentThenAnnotation2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _commentThenAnnotation2 @-1
         set commentAroundAnnotation= @-1
           reference: <testLibraryFragment>::@setter::commentAroundAnnotation
-          enclosingFragment: <testLibraryFragment>
           parameters
             _commentAroundAnnotation @-1
         set commentAroundAnnotation2= @-1
           reference: <testLibraryFragment>::@setter::commentAroundAnnotation2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _commentAroundAnnotation2 @-1
   topLevelVariables
     hasDocComment
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::hasDocComment
       getter: <none>
       setter: <none>
     hasDocComment2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::hasDocComment2
       getter: <none>
       setter: <none>
     hasAnnotation
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::hasAnnotation
       getter: <none>
       setter: <none>
     hasAnnotation2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::hasAnnotation2
       getter: <none>
       setter: <none>
     annotationThenComment
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::annotationThenComment
       getter: <none>
       setter: <none>
     annotationThenComment2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::annotationThenComment2
       getter: <none>
       setter: <none>
     commentThenAnnotation
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::commentThenAnnotation
       getter: <none>
       setter: <none>
     commentThenAnnotation2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::commentThenAnnotation2
       getter: <none>
       setter: <none>
     commentAroundAnnotation
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::commentAroundAnnotation
       getter: <none>
       setter: <none>
     commentAroundAnnotation2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::commentAroundAnnotation2
       getter: <none>
@@ -3942,48 +3718,37 @@
   getters
     synthetic static get hasDocComment
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::hasDocComment
     synthetic static get hasDocComment2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::hasDocComment2
     synthetic static get hasAnnotation
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::hasAnnotation
     synthetic static get hasAnnotation2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::hasAnnotation2
     synthetic static get annotationThenComment
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::annotationThenComment
     synthetic static get annotationThenComment2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::annotationThenComment2
     synthetic static get commentThenAnnotation
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::commentThenAnnotation
     synthetic static get commentThenAnnotation2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::commentThenAnnotation2
     synthetic static get commentAroundAnnotation
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::commentAroundAnnotation
     synthetic static get commentAroundAnnotation2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::commentAroundAnnotation2
   setters
     synthetic static set hasDocComment=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _hasDocComment
           reference: <none>
@@ -3991,7 +3756,6 @@
       firstFragment: <testLibraryFragment>::@setter::hasDocComment
     synthetic static set hasDocComment2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _hasDocComment2
           reference: <none>
@@ -3999,7 +3763,6 @@
       firstFragment: <testLibraryFragment>::@setter::hasDocComment2
     synthetic static set hasAnnotation=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _hasAnnotation
           reference: <none>
@@ -4007,7 +3770,6 @@
       firstFragment: <testLibraryFragment>::@setter::hasAnnotation
     synthetic static set hasAnnotation2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _hasAnnotation2
           reference: <none>
@@ -4015,7 +3777,6 @@
       firstFragment: <testLibraryFragment>::@setter::hasAnnotation2
     synthetic static set annotationThenComment=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _annotationThenComment
           reference: <none>
@@ -4023,7 +3784,6 @@
       firstFragment: <testLibraryFragment>::@setter::annotationThenComment
     synthetic static set annotationThenComment2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _annotationThenComment2
           reference: <none>
@@ -4031,7 +3791,6 @@
       firstFragment: <testLibraryFragment>::@setter::annotationThenComment2
     synthetic static set commentThenAnnotation=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _commentThenAnnotation
           reference: <none>
@@ -4039,7 +3798,6 @@
       firstFragment: <testLibraryFragment>::@setter::commentThenAnnotation
     synthetic static set commentThenAnnotation2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _commentThenAnnotation2
           reference: <none>
@@ -4047,7 +3805,6 @@
       firstFragment: <testLibraryFragment>::@setter::commentThenAnnotation2
     synthetic static set commentAroundAnnotation=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _commentAroundAnnotation
           reference: <none>
@@ -4055,7 +3812,6 @@
       firstFragment: <testLibraryFragment>::@setter::commentAroundAnnotation
     synthetic static set commentAroundAnnotation2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _commentAroundAnnotation2
           reference: <none>
@@ -4118,11 +3874,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       codeOffset: 0
       codeLength: 13
       typeParameters
@@ -4175,16 +3929,13 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
             named @21
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 20
               nameEnd: 26
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -4231,11 +3982,9 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -4298,32 +4047,26 @@
           fields
             foo @16
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -4335,12 +4078,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -4391,25 +4132,20 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @20
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -4420,7 +4156,6 @@
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -4468,11 +4203,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @17
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               typeParameters
                 T @21
               parameters
@@ -4480,7 +4213,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -4544,27 +4276,22 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @16
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 x @24
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           setter: <none>
@@ -4575,7 +4302,6 @@
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional x
               reference: <none>
@@ -4619,11 +4345,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -4666,7 +4390,6 @@
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@extension::E
@@ -4854,7 +4577,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::M
@@ -4892,23 +4614,19 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @8
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
diff --git a/pkg/analyzer/test/src/summary/elements/part_include_test.dart b/pkg/analyzer/test/src/summary/elements/part_include_test.dart
index 09aedc3..46e2c0e 100644
--- a/pkg/analyzer/test/src/summary/elements/part_include_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/part_include_test.dart
@@ -92,13 +92,11 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
         element: <testLibrary>::@fragment::package:test/foo.dart::@class::A
     class A
       reference: <testLibrary>::@fragment::package:test/foo.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/foo.dart::@class::A
 ''');
   }
@@ -180,13 +178,11 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
         element: <testLibrary>::@fragment::package:test/foo_io.dart::@class::A
     class A
       reference: <testLibrary>::@fragment::package:test/foo_io.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/foo_io.dart::@class::A
 ''');
   }
@@ -268,13 +264,11 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
         element: <testLibrary>::@fragment::package:test/foo_io.dart::@class::A
     class A
       reference: <testLibrary>::@fragment::package:test/foo_io.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/foo_io.dart::@class::A
 ''');
   }
@@ -356,13 +350,11 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
         element: <testLibrary>::@fragment::package:test/foo_html.dart::@class::A
     class A
       reference: <testLibrary>::@fragment::package:test/foo_html.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/foo_html.dart::@class::A
 ''');
   }
@@ -444,13 +436,11 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
         element: <testLibrary>::@fragment::package:test/foo_html.dart::@class::A
     class A
       reference: <testLibrary>::@fragment::package:test/foo_html.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/foo_html.dart::@class::A
 ''');
   }
@@ -674,27 +664,21 @@
   classes
     class Z
       reference: <testLibraryFragment>::@class::Z
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::Z
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
     class A11
       reference: <testLibrary>::@fragment::package:test/a11.dart::@class::A11
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a11.dart::@class::A11
     class A12
       reference: <testLibrary>::@fragment::package:test/a12.dart::@class::A12
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a12.dart::@class::A12
     class B11
       reference: <testLibrary>::@fragment::package:test/b11.dart::@class::B11
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b11.dart::@class::B11
     class B12
       reference: <testLibrary>::@fragment::package:test/b12.dart::@class::B12
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b12.dart::@class::B12
 ''');
   }
@@ -784,7 +768,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -793,11 +776,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::B::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -805,7 +786,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B
       constructors
         synthetic new
@@ -869,7 +849,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -878,11 +857,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::B::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -890,7 +867,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::B
       constructors
         synthetic new
@@ -1255,27 +1231,21 @@
   classes
     class Z
       reference: <testLibraryFragment>::@class::Z
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::Z
     class A
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::A
     class A11
       reference: <testLibrary>::@fragment::package:test/a11.dart::@class::A11
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a11.dart::@class::A11
     class A12
       reference: <testLibrary>::@fragment::package:test/a12.dart::@class::A12
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a12.dart::@class::A12
     class B11
       reference: <testLibrary>::@fragment::package:test/b11.dart::@class::B11
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b11.dart::@class::B11
     class B12
       reference: <testLibrary>::@fragment::package:test/b12.dart::@class::B12
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b12.dart::@class::B12
 ''');
   }
diff --git a/pkg/analyzer/test/src/summary/elements/record_type_test.dart b/pkg/analyzer/test/src/summary/elements/record_type_test.dart
index 0a2cb42..523a9a7 100644
--- a/pkg/analyzer/test/src/summary/elements/record_type_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/record_type_test.dart
@@ -58,25 +58,20 @@
           fields
             x @32
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: (int, String)
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -87,7 +82,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
 ''');
   }
@@ -135,25 +129,20 @@
           fields
             x @18
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: (int, bool)
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -164,7 +153,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
 ''');
   }
@@ -209,17 +197,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @17
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @35
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -273,15 +258,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @26
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -330,11 +312,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: (int, String)
@@ -373,7 +353,6 @@
   extensions
     extension IntStringExtension
       reference: <testLibraryFragment>::@extension::IntStringExtension
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::IntStringExtension
 ''');
   }
@@ -683,23 +662,19 @@
       topLevelVariables
         final x @20
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: (int, String)
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -734,23 +709,19 @@
       topLevelVariables
         final x @6
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: (int, bool)
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -816,23 +787,19 @@
       topLevelVariables
         const x @6
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -894,23 +861,19 @@
       topLevelVariables
         const x @6
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
diff --git a/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart b/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart
index ca1e938..a30f7cc 100644
--- a/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart
@@ -78,7 +78,6 @@
           constructors
             named @55
               reference: dart:foo::<fragment>::@class::A::@constructor::named
-              enclosingFragment: dart:foo::<fragment>::@class::A
               sinceSdkVersion: 2.15.0
               periodOffset: 54
               nameEnd: 60
@@ -87,13 +86,11 @@
           constructors
             named @81
               reference: dart:foo::<fragment>::@class::B::@constructor::named
-              enclosingFragment: dart:foo::<fragment>::@class::B
               periodOffset: 80
               nameEnd: 86
   classes
     class A
       reference: dart:foo::<fragment>::@class::A
-      enclosingElement2: dart:foo
       sinceSdkVersion: 2.15.0
       firstFragment: dart:foo::<fragment>::@class::A
       constructors
@@ -102,7 +99,6 @@
           firstFragment: dart:foo::<fragment>::@class::A::@constructor::named
     class B
       reference: dart:foo::<fragment>::@class::B
-      enclosingElement2: dart:foo
       firstFragment: dart:foo::<fragment>::@class::B
       constructors
         named
@@ -165,31 +161,26 @@
           fields
             foo @57
               reference: dart:foo::<fragment>::@class::A::@field::foo
-              enclosingFragment: dart:foo::<fragment>::@class::A
               getter2: dart:foo::<fragment>::@class::A::@getter::foo
               setter2: dart:foo::<fragment>::@class::A::@setter::foo
           getters
             get foo @-1
               reference: dart:foo::<fragment>::@class::A::@getter::foo
-              enclosingFragment: dart:foo::<fragment>::@class::A
               sinceSdkVersion: 2.15.0
           setters
             set foo= @-1
               reference: dart:foo::<fragment>::@class::A::@setter::foo
-              enclosingFragment: dart:foo::<fragment>::@class::A
               sinceSdkVersion: 2.15.0
               parameters
                 _foo @-1
   classes
     class A
       reference: dart:foo::<fragment>::@class::A
-      enclosingElement2: dart:foo
       sinceSdkVersion: 2.15.0
       firstFragment: dart:foo::<fragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@class::A
           type: int
           firstFragment: dart:foo::<fragment>::@class::A::@field::foo
           getter: <none>
@@ -197,12 +188,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@class::A
           firstFragment: dart:foo::<fragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -255,30 +244,25 @@
           fields
             foo @-1
               reference: dart:foo::<fragment>::@class::A::@field::foo
-              enclosingFragment: dart:foo::<fragment>::@class::A
               getter2: dart:foo::<fragment>::@class::A::@getter::foo
           getters
             get foo @61
               reference: dart:foo::<fragment>::@class::A::@getter::foo
-              enclosingFragment: dart:foo::<fragment>::@class::A
               sinceSdkVersion: 2.15.0
   classes
     class A
       reference: dart:foo::<fragment>::@class::A
-      enclosingElement2: dart:foo
       sinceSdkVersion: 2.15.0
       firstFragment: dart:foo::<fragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@class::A
           type: int
           firstFragment: dart:foo::<fragment>::@class::A::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@class::A
           firstFragment: dart:foo::<fragment>::@class::A::@getter::foo
 ''');
   }
@@ -322,12 +306,10 @@
           methods
             foo @58
               reference: dart:foo::<fragment>::@class::A::@method::foo
-              enclosingFragment: dart:foo::<fragment>::@class::A
               sinceSdkVersion: 2.15.0
   classes
     class A
       reference: dart:foo::<fragment>::@class::A
-      enclosingElement2: dart:foo
       sinceSdkVersion: 2.15.0
       firstFragment: dart:foo::<fragment>::@class::A
       methods
@@ -377,12 +359,10 @@
           methods
             foo @75
               reference: dart:foo::<fragment>::@class::A::@method::foo
-              enclosingFragment: dart:foo::<fragment>::@class::A
               sinceSdkVersion: 2.16.0
   classes
     class A
       reference: dart:foo::<fragment>::@class::A
-      enclosingElement2: dart:foo
       sinceSdkVersion: 2.15.0
       firstFragment: dart:foo::<fragment>::@class::A
       methods
@@ -432,12 +412,10 @@
           methods
             foo @75
               reference: dart:foo::<fragment>::@class::A::@method::foo
-              enclosingFragment: dart:foo::<fragment>::@class::A
               sinceSdkVersion: 2.15.0
   classes
     class A
       reference: dart:foo::<fragment>::@class::A
-      enclosingElement2: dart:foo
       sinceSdkVersion: 2.15.0
       firstFragment: dart:foo::<fragment>::@class::A
       methods
@@ -494,32 +472,27 @@
           fields
             foo @-1
               reference: dart:foo::<fragment>::@class::A::@field::foo
-              enclosingFragment: dart:foo::<fragment>::@class::A
               setter2: dart:foo::<fragment>::@class::A::@setter::foo
           setters
             set foo= @57
               reference: dart:foo::<fragment>::@class::A::@setter::foo
-              enclosingFragment: dart:foo::<fragment>::@class::A
               sinceSdkVersion: 2.15.0
               parameters
                 _ @65
   classes
     class A
       reference: dart:foo::<fragment>::@class::A
-      enclosingElement2: dart:foo
       sinceSdkVersion: 2.15.0
       firstFragment: dart:foo::<fragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@class::A
           type: int
           firstFragment: dart:foo::<fragment>::@class::A::@field::foo
           setter: <none>
       setters
         set foo=
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -592,64 +565,51 @@
           fields
             enumConstant v1 @37
               reference: dart:foo::<fragment>::@enum::E::@field::v1
-              enclosingFragment: dart:foo::<fragment>::@enum::E
               getter2: dart:foo::<fragment>::@enum::E::@getter::v1
             enumConstant v2 @60
               reference: dart:foo::<fragment>::@enum::E::@field::v2
-              enclosingFragment: dart:foo::<fragment>::@enum::E
               getter2: dart:foo::<fragment>::@enum::E::@getter::v2
             values @-1
               reference: dart:foo::<fragment>::@enum::E::@field::values
-              enclosingFragment: dart:foo::<fragment>::@enum::E
               getter2: dart:foo::<fragment>::@enum::E::@getter::values
           getters
             get v1 @-1
               reference: dart:foo::<fragment>::@enum::E::@getter::v1
-              enclosingFragment: dart:foo::<fragment>::@enum::E
             get v2 @-1
               reference: dart:foo::<fragment>::@enum::E::@getter::v2
-              enclosingFragment: dart:foo::<fragment>::@enum::E
               sinceSdkVersion: 2.15.0
             get values @-1
               reference: dart:foo::<fragment>::@enum::E::@getter::values
-              enclosingFragment: dart:foo::<fragment>::@enum::E
   enums
     enum E
       reference: dart:foo::<fragment>::@enum::E
-      enclosingElement2: dart:foo
       firstFragment: dart:foo::<fragment>::@enum::E
       supertype: Enum
       fields
         static const v1
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@enum::E
           type: E
           firstFragment: dart:foo::<fragment>::@enum::E::@field::v1
           getter: <none>
         static const v2
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@enum::E
           type: E
           firstFragment: dart:foo::<fragment>::@enum::E::@field::v2
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@enum::E
           type: List<E>
           firstFragment: dart:foo::<fragment>::@enum::E::@field::values
           getter: <none>
       getters
         synthetic static get v1
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@enum::E
           firstFragment: dart:foo::<fragment>::@enum::E::@getter::v1
         synthetic static get v2
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@enum::E
           firstFragment: dart:foo::<fragment>::@enum::E::@getter::v2
         synthetic static get values
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@enum::E
           firstFragment: dart:foo::<fragment>::@enum::E::@getter::values
 ''');
   }
@@ -716,53 +676,43 @@
           fields
             enumConstant v @52
               reference: dart:foo::<fragment>::@enum::E::@field::v
-              enclosingFragment: dart:foo::<fragment>::@enum::E
               getter2: dart:foo::<fragment>::@enum::E::@getter::v
             values @-1
               reference: dart:foo::<fragment>::@enum::E::@field::values
-              enclosingFragment: dart:foo::<fragment>::@enum::E
               getter2: dart:foo::<fragment>::@enum::E::@getter::values
           getters
             get v @-1
               reference: dart:foo::<fragment>::@enum::E::@getter::v
-              enclosingFragment: dart:foo::<fragment>::@enum::E
               sinceSdkVersion: 2.15.0
             get values @-1
               reference: dart:foo::<fragment>::@enum::E::@getter::values
-              enclosingFragment: dart:foo::<fragment>::@enum::E
           methods
             foo @62
               reference: dart:foo::<fragment>::@enum::E::@method::foo
-              enclosingFragment: dart:foo::<fragment>::@enum::E
               sinceSdkVersion: 2.15.0
   enums
     enum E
       reference: dart:foo::<fragment>::@enum::E
-      enclosingElement2: dart:foo
       sinceSdkVersion: 2.15.0
       firstFragment: dart:foo::<fragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@enum::E
           type: E
           firstFragment: dart:foo::<fragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@enum::E
           type: List<E>
           firstFragment: dart:foo::<fragment>::@enum::E::@field::values
           getter: <none>
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@enum::E
           firstFragment: dart:foo::<fragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: dart:foo::<fragment>::@enum::E
           firstFragment: dart:foo::<fragment>::@enum::E::@getter::values
       methods
         foo
@@ -811,12 +761,10 @@
           methods
             foo @69
               reference: dart:foo::<fragment>::@extension::E::@method::foo
-              enclosingFragment: dart:foo::<fragment>::@extension::E
               sinceSdkVersion: 2.15.0
   extensions
     extension E
       reference: dart:foo::<fragment>::@extension::E
-      enclosingElement2: dart:foo
       sinceSdkVersion: 2.15.0
       firstFragment: dart:foo::<fragment>::@extension::E
       methods
@@ -867,12 +815,10 @@
           methods
             foo @58
               reference: dart:foo::<fragment>::@mixin::M::@method::foo
-              enclosingFragment: dart:foo::<fragment>::@mixin::M
               sinceSdkVersion: 2.15.0
   mixins
     mixin M
       reference: dart:foo::<fragment>::@mixin::M
-      enclosingElement2: dart:foo
       sinceSdkVersion: 2.15.0
       firstFragment: dart:foo::<fragment>::@mixin::M
       superclassConstraints
@@ -1175,25 +1121,21 @@
       topLevelVariables
         final foo @47
           reference: dart:foo::<fragment>::@topLevelVariable::foo
-          enclosingFragment: dart:foo::<fragment>
           sinceSdkVersion: 2.15.0
           getter2: dart:foo::<fragment>::@getter::foo
       getters
         get foo @-1
           reference: dart:foo::<fragment>::@getter::foo
-          enclosingFragment: dart:foo::<fragment>
           sinceSdkVersion: 2.15.0
   topLevelVariables
     final foo
       reference: <none>
-      enclosingElement2: dart:foo
       type: int
       firstFragment: dart:foo::<fragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: dart:foo
       firstFragment: dart:foo::<fragment>::@getter::foo
 ''');
   }
diff --git a/pkg/analyzer/test/src/summary/elements/top_level_function_test.dart b/pkg/analyzer/test/src/summary/elements/top_level_function_test.dart
index 68e63ce..e10cb75 100644
--- a/pkg/analyzer/test/src/summary/elements/top_level_function_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/top_level_function_test.dart
@@ -951,11 +951,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::main::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::main
   classes
     class main
       reference: <testLibraryFragment>::@class::main
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::main
       constructors
         synthetic new
@@ -1018,7 +1016,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::main::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::main
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -1032,17 +1029,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @40
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class alias main
       reference: <testLibraryFragment>::@class::main
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::main
       supertype: C
       constructors
@@ -1052,7 +1046,6 @@
           firstFragment: <testLibraryFragment>::@class::main::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1060,7 +1053,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -1149,23 +1141,19 @@
       topLevelVariables
         synthetic main @-1
           reference: <testLibraryFragment>::@topLevelVariable::main
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::main
       getters
         get main @4
           reference: <testLibraryFragment>::@getter::main
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     synthetic main
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::main
       getter: <none>
   getters
     static get main
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::main
 ''');
   }
@@ -1279,23 +1267,19 @@
       topLevelVariables
         main @4
           reference: <testLibraryFragment>::@topLevelVariable::main
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::main
           setter2: <testLibraryFragment>::@setter::main
       getters
         get main @-1
           reference: <testLibraryFragment>::@getter::main
-          enclosingFragment: <testLibraryFragment>
       setters
         set main= @-1
           reference: <testLibraryFragment>::@setter::main
-          enclosingFragment: <testLibraryFragment>
           parameters
             _main @-1
   topLevelVariables
     main
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::main
       getter: <none>
@@ -1303,12 +1287,10 @@
   getters
     synthetic static get main
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::main
   setters
     synthetic static set main=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _main
           reference: <none>
@@ -1578,13 +1560,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::foo::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
   classes
     class foo
       reference: <testLibraryFragment>::@class::foo
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::foo
       constructors
         synthetic new
@@ -1770,25 +1750,21 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @24
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -1852,12 +1828,10 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::foo
       setters
         set foo= @20
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             _ @28
     <testLibrary>::@fragment::package:test/a.dart
@@ -1865,14 +1839,12 @@
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       setter: <none>
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -1945,17 +1917,14 @@
       topLevelVariables
         foo @20
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
           setter2: <testLibraryFragment>::@setter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
       setters
         set foo= @-1
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -1963,7 +1932,6 @@
   topLevelVariables
     foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
@@ -1971,12 +1939,10 @@
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
   setters
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
@@ -2048,16 +2014,13 @@
       getters
         augment get foo @37
           reference: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
   classes
     class foo
       reference: <testLibraryFragment>::@class::foo
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::foo
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
   exportedReferences
     declared <testLibraryFragment>::@class::foo
@@ -2127,11 +2090,9 @@
       getters
         augment get foo @37
           reference: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
   exportedReferences
     declared <testLibraryFragment>::@function::foo
@@ -2208,31 +2169,26 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @23
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       getters
         augment get foo @37
           reference: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           previousFragment: <testLibraryFragment>::@getter::foo
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
   exportedReferences
     declared <testLibraryFragment>::@getter::foo
@@ -2292,11 +2248,9 @@
       getters
         augment get foo @37
           reference: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
   exportedReferences
   exportNamespace
@@ -2374,12 +2328,10 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::foo
       setters
         set foo= @19
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             _ @27
     <testLibrary>::@fragment::package:test/a.dart
@@ -2387,23 +2339,19 @@
       getters
         augment get foo @37
           reference: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       setter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -2497,18 +2445,15 @@
       topLevelVariables
         foo @19
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
           setter2: <testLibraryFragment>::@setter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
       setters
         set foo= @-1
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -2516,12 +2461,10 @@
       getters
         augment get foo @37
           reference: <testLibrary>::@fragment::package:test/a.dart::@getterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           previousFragment: <testLibraryFragment>::@getter::foo
   topLevelVariables
     foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
@@ -2529,12 +2472,10 @@
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
   setters
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
@@ -2616,19 +2557,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::foo::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::foo
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       setters
         augment set foo= @33
           reference: <testLibrary>::@fragment::package:test/a.dart::@setterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _ @41
   classes
     class foo
       reference: <testLibraryFragment>::@class::foo
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::foo
       constructors
         synthetic new
@@ -2637,7 +2575,6 @@
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -2720,36 +2657,30 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @23
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       setters
         augment set foo= @33
           reference: <testLibrary>::@fragment::package:test/a.dart::@setterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _ @41
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -2816,13 +2747,11 @@
       setters
         augment set foo= @33
           reference: <testLibrary>::@fragment::package:test/a.dart::@setterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _ @41
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -2907,12 +2836,10 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::foo
       setters
         set foo= @19
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             _ @27
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@setterAugmentation::foo
@@ -2921,21 +2848,18 @@
       setters
         augment set foo= @33
           reference: <testLibrary>::@fragment::package:test/a.dart::@setterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _ @41
           previousFragment: <testLibraryFragment>::@setter::foo
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       setter: <none>
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -3032,17 +2956,14 @@
       topLevelVariables
         foo @19
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
           setter2: <testLibraryFragment>::@setter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
       setters
         set foo= @-1
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             _foo @-1
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@setterAugmentation::foo
@@ -3051,14 +2972,12 @@
       setters
         augment set foo= @33
           reference: <testLibrary>::@fragment::package:test/a.dart::@setterAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _ @41
           previousFragment: <testLibraryFragment>::@setter::foo
   topLevelVariables
     foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
@@ -3066,12 +2985,10 @@
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
   setters
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
diff --git a/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart b/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart
index a9aef1b..d0b9cc6 100644
--- a/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart
@@ -51,23 +51,19 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @16
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -112,23 +108,19 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @37
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Stream<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -166,24 +158,20 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @64
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /**\n * Docs\n */
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       documentationComment: /**\n * Docs\n */
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
@@ -216,23 +204,19 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @17
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     static external get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -295,42 +279,34 @@
           fields
             f @-1
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::D::@constructor::new
           getters
             get f @24
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @52
           reference: <testLibraryFragment>::@class::D
           fields
             f @-1
               reference: <testLibraryFragment>::@class::D::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::D
               getter2: <testLibraryFragment>::@class::D::@getter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           getters
             get f @64
               reference: <testLibraryFragment>::@class::D::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       fields
         synthetic f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -342,16 +318,13 @@
       getters
         get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       fields
         synthetic f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: int
           firstFragment: <testLibraryFragment>::@class::D::@field::f
           getter: <none>
@@ -362,7 +335,6 @@
       getters
         abstract get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           firstFragment: <testLibraryFragment>::@class::D::@getter::f
 ''');
   }
@@ -396,23 +368,19 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @18
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Iterator<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -452,40 +420,32 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
         synthetic y @-1
           reference: <testLibraryFragment>::@topLevelVariable::y
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::y
       getters
         get x @8
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
         get y @23
           reference: <testLibraryFragment>::@getter::y
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
     synthetic y
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::y
       getter: <none>
   getters
     static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
     static get y
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::y
 ''');
   }
@@ -533,23 +493,19 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @8
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @25
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             value @31
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -557,12 +513,10 @@
   getters
     static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional value
           reference: <none>
@@ -606,23 +560,19 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @33
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @9
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             value @15
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -630,12 +580,10 @@
   getters
     static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional value
           reference: <none>
@@ -680,26 +628,22 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::x
       setters
         set x= @69
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /**\n * Docs\n */
           parameters
             value @71
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       setter: <none>
   setters
     static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       documentationComment: /**\n * Docs\n */
       parameters
         requiredPositional value
@@ -739,25 +683,21 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::x
       setters
         set x= @18
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             value @24
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       setter: <none>
   setters
     static external set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional value
           reference: <none>
@@ -796,25 +736,21 @@
       topLevelVariables
         synthetic f @-1
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::f
       setters
         set f= @4
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             value @10
   topLevelVariables
     synthetic f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
       setter: <none>
   setters
     static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional value
           reference: <none>
@@ -865,40 +801,33 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::x
         synthetic y @-1
           reference: <testLibraryFragment>::@topLevelVariable::y
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::y
       setters
         set x= @9
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             value @15
         set y= @29
           reference: <testLibraryFragment>::@setter::y
-          enclosingFragment: <testLibraryFragment>
           parameters
             value @31
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       setter: <none>
     synthetic y
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::y
       setter: <none>
   setters
     static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional value
           reference: <none>
@@ -906,7 +835,6 @@
       firstFragment: <testLibraryFragment>::@setter::x
     static set y=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional value
           reference: <none>
@@ -951,23 +879,19 @@
       topLevelVariables
         i @13
           reference: <testLibraryFragment>::@topLevelVariable::i
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::i
           setter2: <testLibraryFragment>::@setter::i
       getters
         get i @-1
           reference: <testLibraryFragment>::@getter::i
-          enclosingFragment: <testLibraryFragment>
       setters
         set i= @-1
           reference: <testLibraryFragment>::@setter::i
-          enclosingFragment: <testLibraryFragment>
           parameters
             _i @-1
   topLevelVariables
     i
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::i
       getter: <none>
@@ -975,12 +899,10 @@
   getters
     synthetic static get i
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::i
   setters
     synthetic static set i=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _i
           reference: <none>
@@ -1026,23 +948,19 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @8
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @25
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             value @31
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -1050,12 +968,10 @@
   getters
     static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional value
           reference: <none>
@@ -1101,23 +1017,19 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @33
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @9
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             value @15
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -1125,12 +1037,10 @@
   getters
     static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional value
           reference: <none>
@@ -1197,53 +1107,43 @@
       topLevelVariables
         foo @4
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo::@def::0
           setter2: <testLibraryFragment>::@setter::foo
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo::@def::1
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo::@def::0
-          enclosingFragment: <testLibraryFragment>
         get foo @21
           reference: <testLibraryFragment>::@getter::foo::@def::1
-          enclosingFragment: <testLibraryFragment>
       setters
         set foo= @-1
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             _foo @-1
   topLevelVariables
     foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
       setter: <none>
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo::@def::0
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo::@def::1
   setters
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
@@ -1313,51 +1213,42 @@
       topLevelVariables
         foo @4
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
           setter2: <testLibraryFragment>::@setter::foo::@def::0
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::foo::@def::1
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
       setters
         set foo= @-1
           reference: <testLibraryFragment>::@setter::foo::@def::0
-          enclosingFragment: <testLibraryFragment>
           parameters
             _foo @-1
         set foo= @17
           reference: <testLibraryFragment>::@setter::foo::@def::1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _ @25
   topLevelVariables
     foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
       setter: <none>
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       setter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
   setters
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
@@ -1365,7 +1256,6 @@
       firstFragment: <testLibraryFragment>::@setter::foo::@def::0
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -1420,23 +1310,19 @@
       topLevelVariables
         final foo @10
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
           setter2: <testLibraryFragment>::@setter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
       setters
         set foo= @23
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             newValue @31
   topLevelVariables
     final foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
@@ -1444,12 +1330,10 @@
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional newValue
           reference: <none>
@@ -1493,23 +1377,19 @@
       topLevelVariables
         x @4
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -1517,12 +1397,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -1563,23 +1441,19 @@
       topLevelVariables
         const i @10
           reference: <testLibraryFragment>::@topLevelVariable::i
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::i
       getters
         get i @-1
           reference: <testLibraryFragment>::@getter::i
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const i
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::i
       getter: <none>
   getters
     synthetic static get i
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::i
 ''');
   }
@@ -1616,23 +1490,19 @@
       topLevelVariables
         const i @15
           reference: <testLibraryFragment>::@topLevelVariable::i
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::i
       getters
         get i @-1
           reference: <testLibraryFragment>::@getter::i
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     late const i
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::i
       getter: <none>
   getters
     synthetic static get i
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::i
 ''');
   }
@@ -1677,24 +1547,20 @@
       topLevelVariables
         x @64
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           documentationComment: /**\n * Docs\n */
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -1702,12 +1568,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -1744,23 +1608,19 @@
       topLevelVariables
         final x @10
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -1827,47 +1687,39 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @39
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       topLevelVariables
         synthetic x @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::x
       setters
         set x= @25
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _ @31
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::x
       setter: <none>
   getters
     static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -1939,12 +1791,10 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::x
       setters
         set x= @40
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _ @46
     <testLibrary>::@fragment::package:test/a.dart
@@ -1952,34 +1802,28 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::x
       getters
         get x @24
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       setter: <none>
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::x
       getter: <none>
   getters
     static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::x
   setters
     static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -2059,47 +1903,39 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::x
       getters
         get x @24
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       topLevelVariables
         synthetic x @-1
           reference: <testLibrary>::@fragment::package:test/b.dart::@topLevelVariable::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
           setter2: <testLibrary>::@fragment::package:test/b.dart::@setter::x
       setters
         set x= @25
           reference: <testLibrary>::@fragment::package:test/b.dart::@setter::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
           parameters
             _ @31
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::x
       getter: <none>
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@topLevelVariable::x
       setter: <none>
   getters
     static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::x
   setters
     static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -2162,23 +1998,19 @@
       topLevelVariables
         x @4
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -2186,12 +2018,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -2235,23 +2065,19 @@
       topLevelVariables
         v @4
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -2259,12 +2085,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -2301,23 +2125,19 @@
       topLevelVariables
         final v @10
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -2350,23 +2170,19 @@
       topLevelVariables
         final v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -2413,23 +2229,19 @@
       topLevelVariables
         const x @6
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: (int, bool)
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -2496,34 +2308,28 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       extensions
         extension E @21
           reference: <testLibraryFragment>::@extension::E
           methods
             f @43
               reference: <testLibraryFragment>::@extension::E::@method::f
-              enclosingFragment: <testLibraryFragment>::@extension::E
       topLevelVariables
         x @59
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -2532,7 +2338,6 @@
   extensions
     extension E
       reference: <testLibraryFragment>::@extension::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::E
       methods
         static f
@@ -2541,7 +2346,6 @@
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -2549,12 +2353,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -2598,23 +2400,19 @@
       topLevelVariables
         v @4
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -2622,12 +2420,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -2671,23 +2467,19 @@
       topLevelVariables
         x @9
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     late x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -2695,12 +2487,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -2743,23 +2533,19 @@
       topLevelVariables
         final x @15
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     late final x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -2767,12 +2553,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -2809,23 +2593,19 @@
       topLevelVariables
         final x @15
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     late final x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -2862,23 +2642,19 @@
       topLevelVariables
         const i @6
           reference: <testLibraryFragment>::@topLevelVariable::i
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::i
       getters
         get i @-1
           reference: <testLibraryFragment>::@getter::i
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const i
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::i
       getter: <none>
   getters
     synthetic static get i
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::i
 ''');
   }
@@ -2922,23 +2698,19 @@
       topLevelVariables
         final b @23
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -2999,44 +2771,36 @@
       topLevelVariables
         final b @34
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       topLevelVariables
         final a @19
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::a
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::a
       getters
         get a @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::a
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
   topLevelVariables
     final b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
     final a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::a
 ''');
   }
@@ -3069,23 +2833,19 @@
       topLevelVariables
         final i @6
           reference: <testLibraryFragment>::@topLevelVariable::i
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::i
       getters
         get i @-1
           reference: <testLibraryFragment>::@getter::i
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final i
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::i
       getter: <none>
   getters
     synthetic static get i
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::i
 ''');
   }
@@ -3131,23 +2891,19 @@
       topLevelVariables
         final x @23
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -3223,12 +2979,10 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::x
       setters
         set x= @25
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _ @31
     <testLibrary>::@fragment::package:test/b.dart
@@ -3236,34 +2990,28 @@
       topLevelVariables
         synthetic x @-1
           reference: <testLibrary>::@fragment::package:test/b.dart::@topLevelVariable::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
           getter2: <testLibrary>::@fragment::package:test/b.dart::@getter::x
       getters
         get x @24
           reference: <testLibrary>::@fragment::package:test/b.dart::@getter::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
   topLevelVariables
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::x
       setter: <none>
     synthetic x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@topLevelVariable::x
       getter: <none>
   getters
     static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@getter::x
   setters
     static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -3307,23 +3055,19 @@
       topLevelVariables
         v @4
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -3331,12 +3075,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -3383,23 +3125,19 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Never
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
@@ -3407,12 +3145,10 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -3458,23 +3194,19 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
@@ -3482,12 +3214,10 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -3559,20 +3289,16 @@
           constructors
             const new @21
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         const a @41
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -3583,14 +3309,12 @@
   topLevelVariables
     const a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
 ''');
   }
@@ -3644,43 +3368,35 @@
       topLevelVariables
         i @4
           reference: <testLibraryFragment>::@topLevelVariable::i
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::i
           setter2: <testLibraryFragment>::@setter::i
         j @11
           reference: <testLibraryFragment>::@topLevelVariable::j
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::j
           setter2: <testLibraryFragment>::@setter::j
       getters
         get i @-1
           reference: <testLibraryFragment>::@getter::i
-          enclosingFragment: <testLibraryFragment>
         get j @-1
           reference: <testLibraryFragment>::@getter::j
-          enclosingFragment: <testLibraryFragment>
       setters
         set i= @-1
           reference: <testLibraryFragment>::@setter::i
-          enclosingFragment: <testLibraryFragment>
           parameters
             _i @-1
         set j= @-1
           reference: <testLibraryFragment>::@setter::j
-          enclosingFragment: <testLibraryFragment>
           parameters
             _j @-1
   topLevelVariables
     i
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::i
       getter: <none>
       setter: <none>
     j
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::j
       getter: <none>
@@ -3688,16 +3404,13 @@
   getters
     synthetic static get i
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::i
     synthetic static get j
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::j
   setters
     synthetic static set i=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _i
           reference: <none>
@@ -3705,7 +3418,6 @@
       firstFragment: <testLibraryFragment>::@setter::i
     synthetic static set j=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _j
           reference: <none>
@@ -3824,29 +3536,24 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       topLevelVariables
         augment A @33
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::A
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::A
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::A
       getters
         get A @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::A
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
       setters
         set A= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::A
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _A @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -3855,7 +3562,6 @@
   topLevelVariables
     A
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::A
       getter: <none>
@@ -3863,12 +3569,10 @@
   getters
     synthetic static get A
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::A
   setters
     synthetic static set A=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _A
           reference: <none>
@@ -3963,23 +3667,19 @@
       topLevelVariables
         augment foo @33
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::foo
       getters
         get foo @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
       setters
         set foo= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _foo @-1
   topLevelVariables
     foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::foo
       getter: <none>
@@ -3987,12 +3687,10 @@
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
   setters
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
@@ -4094,40 +3792,33 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @23
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       topLevelVariables
         augment foo @33
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::foo
       getters
         get foo @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
       setters
         set foo= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _foo @-1
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
     foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::foo
       getter: <none>
@@ -4135,16 +3826,13 @@
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
   setters
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
@@ -4249,12 +3937,10 @@
       topLevelVariables
         synthetic foo @-1
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::foo
       setters
         set foo= @19
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             _ @27
     <testLibrary>::@fragment::package:test/a.dart
@@ -4262,29 +3948,24 @@
       topLevelVariables
         augment foo @33
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::foo
       getters
         get foo @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
       setters
         set foo= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _foo @-1
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       setter: <none>
     foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::foo
       getter: <none>
@@ -4292,12 +3973,10 @@
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
@@ -4305,7 +3984,6 @@
       firstFragment: <testLibraryFragment>::@setter::foo
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
@@ -4419,18 +4097,15 @@
       topLevelVariables
         foo @19
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::foo
           getter2: <testLibraryFragment>::@getter::foo
           setter2: <testLibraryFragment>::@setter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
       setters
         set foo= @-1
           reference: <testLibraryFragment>::@setter::foo
-          enclosingFragment: <testLibraryFragment>
           parameters
             _foo @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -4438,24 +4113,20 @@
       topLevelVariables
         augment foo @33
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           previousFragment: <testLibraryFragment>::@topLevelVariable::foo
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::foo
       getters
         get foo @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
       setters
         set foo= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _foo @-1
   topLevelVariables
     foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
@@ -4463,16 +4134,13 @@
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
   setters
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
@@ -4480,7 +4148,6 @@
       firstFragment: <testLibraryFragment>::@setter::foo
     synthetic static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _foo
           reference: <none>
@@ -4574,40 +4241,33 @@
       topLevelVariables
         const foo @25
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           nextFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::foo
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       topLevelVariables
         augment const foo @39
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariableAugmentation::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           previousFragment: <testLibraryFragment>::@topLevelVariable::foo
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
       getters
         get foo @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
   topLevelVariables
     const foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::foo
 ''');
   }
diff --git a/pkg/analyzer/test/src/summary/elements/type_alias_test.dart b/pkg/analyzer/test/src/summary/elements/type_alias_test.dart
index ce103ae..b55d789 100644
--- a/pkg/analyzer/test/src/summary/elements/type_alias_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/type_alias_test.dart
@@ -1268,11 +1268,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -1793,32 +1791,26 @@
           fields
             f @58
               reference: <testLibraryFragment>::@class::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::f
               setter2: <testLibraryFragment>::@class::A::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::A::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _f @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int Function<T>(T)
             alias: <testLibraryFragment>::@typeAlias::Foo
               typeArguments
@@ -1833,12 +1825,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _f
               reference: <none>
@@ -1898,11 +1888,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<T>
@@ -1962,11 +1950,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<T>
@@ -2023,11 +2009,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<T>
@@ -2149,11 +2133,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<T>
@@ -2210,11 +2192,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<T>
@@ -2694,11 +2674,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -3133,17 +3111,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @49
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -3154,7 +3129,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -3233,29 +3207,24 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @42
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @53
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @64
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -3265,7 +3234,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -3273,7 +3241,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -3281,7 +3248,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -3364,29 +3330,24 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @42
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @53
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @64
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -3396,7 +3357,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -3404,7 +3364,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -3412,7 +3371,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -3456,11 +3414,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -3504,11 +3460,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -3577,13 +3531,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @35
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @46
           reference: <testLibraryFragment>::@class::C
           typeParameters
@@ -3591,11 +3543,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -3603,7 +3553,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -3611,7 +3560,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         U
       firstFragment: <testLibraryFragment>::@class::C
@@ -3676,23 +3624,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @35
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @46
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -3700,7 +3644,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -3708,7 +3651,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -3769,17 +3711,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @40
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -3789,7 +3728,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: Object
       constructors
@@ -3864,13 +3802,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @65
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
       mixins
         mixin M1 @41
           reference: <testLibraryFragment>::@mixin::M1
@@ -3879,7 +3815,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -3889,7 +3824,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: Object
       constructors
@@ -3899,13 +3833,11 @@
   mixins
     mixin M1
       reference: <testLibraryFragment>::@mixin::M1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M1
       superclassConstraints
         Object
     mixin M2
       reference: <testLibraryFragment>::@mixin::M2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M2
       superclassConstraints
         Object
@@ -3979,13 +3911,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @65
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
       mixins
         mixin M1 @41
           reference: <testLibraryFragment>::@mixin::M1
@@ -3994,7 +3924,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -4004,7 +3933,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: Object
       constructors
@@ -4014,13 +3942,11 @@
   mixins
     mixin M1
       reference: <testLibraryFragment>::@mixin::M1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M1
       superclassConstraints
         Object
     mixin M2
       reference: <testLibraryFragment>::@mixin::M2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M2
       superclassConstraints
         Object
@@ -4062,11 +3988,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -4128,20 +4052,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @40
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: int}
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -4151,7 +4072,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A<int>
         alias: <testLibraryFragment>::@typeAlias::X
@@ -4221,20 +4141,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @38
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: int}
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -4244,7 +4161,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A<int>
         alias: <testLibraryFragment>::@typeAlias::X
@@ -4293,11 +4209,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -4354,17 +4268,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class D @41
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -4374,7 +4285,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -4436,20 +4346,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class D @41
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: int?}
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -4459,7 +4366,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       supertype: A<int?>
         alias: <testLibraryFragment>::@typeAlias::X
@@ -4506,11 +4412,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -4554,11 +4458,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -5049,7 +4951,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -5157,25 +5058,21 @@
       topLevelVariables
         synthetic A @-1
           reference: <testLibraryFragment>::@topLevelVariable::A
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::A
       getters
         get A @23
           reference: <testLibraryFragment>::@getter::A
-          enclosingFragment: <testLibraryFragment>
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
   topLevelVariables
     synthetic A
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::A
       getter: <none>
   getters
     static get A
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::A
 ''');
   }
@@ -5284,12 +5181,10 @@
       topLevelVariables
         synthetic A @-1
           reference: <testLibraryFragment>::@topLevelVariable::A
-          enclosingFragment: <testLibraryFragment>
           setter2: <testLibraryFragment>::@setter::A
       setters
         set A= @19
           reference: <testLibraryFragment>::@setter::A
-          enclosingFragment: <testLibraryFragment>
           parameters
             _ @25
     <testLibrary>::@fragment::package:test/a.dart
@@ -5297,14 +5192,12 @@
   topLevelVariables
     synthetic A
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::A
       setter: <none>
   setters
     static set A=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _
           reference: <none>
diff --git a/pkg/analyzer/test/src/summary/elements/type_inference_test.dart b/pkg/analyzer/test/src/summary/elements/type_inference_test.dart
index 01d2370..81c1912 100644
--- a/pkg/analyzer/test/src/summary/elements/type_inference_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/type_inference_test.dart
@@ -50,23 +50,19 @@
       topLevelVariables
         final f @6
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: V Function<U, V>(U, V)
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
       getter: <none>
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
 ''');
   }
@@ -121,23 +117,19 @@
       topLevelVariables
         final f @19
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::f
       getters
         get f @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
   topLevelVariables
     final f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double Function(int)
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::f
       getter: <none>
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::f
 ''');
   }
@@ -190,27 +182,22 @@
           fields
             f @21
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: InvalidType
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -221,7 +208,6 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
 ''');
   }
@@ -335,7 +321,6 @@
           constructors
             const new @58
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @77
           reference: <testLibraryFragment>::@class::D
           typeParameters
@@ -344,20 +329,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
       topLevelVariables
         const x @118
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         V
       firstFragment: <testLibraryFragment>::@class::C
@@ -374,7 +355,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -386,14 +366,12 @@
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -493,7 +471,6 @@
           constructors
             const new @50
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @66
           reference: <testLibraryFragment>::@class::D
           typeParameters
@@ -501,20 +478,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
       topLevelVariables
         const x @101
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         const new
@@ -527,7 +500,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::D
@@ -538,14 +510,12 @@
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -629,13 +599,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @18
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
         class S @40
           reference: <testLibraryFragment>::@class::S
@@ -644,27 +612,22 @@
           constructors
             new @59
               reference: <testLibraryFragment>::@class::S::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::S
       topLevelVariables
         s @74
           reference: <testLibraryFragment>::@topLevelVariable::s
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::s
           setter2: <testLibraryFragment>::@setter::s
       getters
         get s @-1
           reference: <testLibraryFragment>::@getter::s
-          enclosingFragment: <testLibraryFragment>
       setters
         set s= @-1
           reference: <testLibraryFragment>::@setter::s
-          enclosingFragment: <testLibraryFragment>
           parameters
             _s @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -672,7 +635,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -682,7 +644,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class S
       reference: <testLibraryFragment>::@class::S
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: A
@@ -698,7 +659,6 @@
   topLevelVariables
     s
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: S<B>
       firstFragment: <testLibraryFragment>::@topLevelVariable::s
       getter: <none>
@@ -706,12 +666,10 @@
   getters
     synthetic static get s
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::s
   setters
     synthetic static set s=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _s
           reference: <none>
@@ -851,21 +809,17 @@
           fields
             b @14
               reference: <testLibraryFragment>::@class::A::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::b
               setter2: <testLibraryFragment>::@class::A::@setter::b
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get b @-1
               reference: <testLibraryFragment>::@class::A::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set b= @-1
               reference: <testLibraryFragment>::@class::A::@setter::b
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _b @-1
         class B @25
@@ -873,21 +827,17 @@
           fields
             c @-1
               reference: <testLibraryFragment>::@class::B::@field::c
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::c
               setter2: <testLibraryFragment>::@class::B::@setter::c
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get c @37
               reference: <testLibraryFragment>::@class::B::@getter::c
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set c= @59
               reference: <testLibraryFragment>::@class::B::@setter::c
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 value @63
         class C @81
@@ -895,52 +845,42 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @92
           reference: <testLibraryFragment>::@class::D
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
               superConstructor: <testLibraryFragment>::@class::C::@constructor::new
       topLevelVariables
         a @111
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         x @128
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: B
           firstFragment: <testLibraryFragment>::@class::A::@field::b
           getter: <none>
@@ -952,12 +892,10 @@
       getters
         synthetic get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::b
       setters
         synthetic set b=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _b
               reference: <none>
@@ -965,12 +903,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::b
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: C
           firstFragment: <testLibraryFragment>::@class::B::@field::c
           getter: <none>
@@ -982,12 +918,10 @@
       getters
         get c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::c
       setters
         set c=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional value
               reference: <none>
@@ -995,7 +929,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::c
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1003,7 +936,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       supertype: C
       constructors
@@ -1014,14 +946,12 @@
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -1029,16 +959,13 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -1046,7 +973,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -1127,63 +1053,51 @@
       topLevelVariables
         x @4
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
         y @40
           reference: <testLibraryFragment>::@topLevelVariable::y
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::y
           setter2: <testLibraryFragment>::@setter::y
         z @53
           reference: <testLibraryFragment>::@topLevelVariable::z
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::z
           setter2: <testLibraryFragment>::@setter::z
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
         get y @-1
           reference: <testLibraryFragment>::@getter::y
-          enclosingFragment: <testLibraryFragment>
         get z @-1
           reference: <testLibraryFragment>::@getter::z
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
         set y= @-1
           reference: <testLibraryFragment>::@setter::y
-          enclosingFragment: <testLibraryFragment>
           parameters
             _y @-1
         set z= @-1
           reference: <testLibraryFragment>::@setter::z
-          enclosingFragment: <testLibraryFragment>
           parameters
             _z @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Iterable<String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
       setter: <none>
     y
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::y
       getter: <none>
       setter: <none>
     z
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::z
       getter: <none>
@@ -1191,20 +1105,16 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
     synthetic static get y
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::y
     synthetic static get z
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::z
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -1212,7 +1122,6 @@
       firstFragment: <testLibraryFragment>::@setter::x
     synthetic static set y=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _y
           reference: <none>
@@ -1220,7 +1129,6 @@
       firstFragment: <testLibraryFragment>::@setter::y
     synthetic static set z=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _z
           reference: <none>
@@ -1314,61 +1222,49 @@
           fields
             p @16
               reference: <testLibraryFragment>::@class::C::@field::p
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::p
               setter2: <testLibraryFragment>::@class::C::@setter::p
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get p @-1
               reference: <testLibraryFragment>::@class::C::@getter::p
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set p= @-1
               reference: <testLibraryFragment>::@class::C::@setter::p
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _p @-1
       topLevelVariables
         x @25
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
         y @40
           reference: <testLibraryFragment>::@topLevelVariable::y
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::y
           setter2: <testLibraryFragment>::@setter::y
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
         get y @-1
           reference: <testLibraryFragment>::@getter::y
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
         set y= @-1
           reference: <testLibraryFragment>::@setter::y
-          enclosingFragment: <testLibraryFragment>
           parameters
             _y @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         p
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::p
           getter: <none>
@@ -1380,12 +1276,10 @@
       getters
         synthetic get p
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::p
       setters
         synthetic set p=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _p
               reference: <none>
@@ -1394,14 +1288,12 @@
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<C>
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
       setter: <none>
     y
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Iterable<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::y
       getter: <none>
@@ -1409,16 +1301,13 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
     synthetic static get y
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::y
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -1426,7 +1315,6 @@
       firstFragment: <testLibraryFragment>::@setter::x
     synthetic static set y=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _y
           reference: <none>
@@ -1521,20 +1409,16 @@
           fields
             x @24
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             new @29
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         U
         V
@@ -1542,7 +1426,6 @@
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -1553,7 +1436,6 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -1610,20 +1492,16 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @22
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         U
         V
@@ -1631,7 +1509,6 @@
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -1642,7 +1519,6 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -1699,18 +1575,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @15
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               typeParameters
                 U @17
                 V @20
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -1785,22 +1658,18 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @27
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 value @29
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         U
         V
@@ -1808,7 +1677,6 @@
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -1819,7 +1687,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional value
               reference: <none>
@@ -1957,32 +1824,26 @@
           constructors
             factory new @35
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
             _ @66
               reference: <testLibraryFragment>::@class::C::@constructor::_
-              enclosingFragment: <testLibraryFragment>::@class::C
               periodOffset: 65
               nameEnd: 67
       topLevelVariables
         c @78
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         P
           bound: num
@@ -2001,7 +1862,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -2009,12 +1869,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -2083,42 +1941,33 @@
           fields
             foo @25
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
             bar @56
               reference: <testLibraryFragment>::@class::A::@field::bar
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::bar
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
             get bar @-1
               reference: <testLibraryFragment>::@class::A::@getter::bar
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             baz @100
               reference: <testLibraryFragment>::@class::A::@method::baz
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
         static final bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int Function(double)
           firstFragment: <testLibraryFragment>::@class::A::@field::bar
           getter: <none>
@@ -2129,11 +1978,9 @@
       getters
         synthetic static get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
         synthetic static get bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::bar
       methods
         static baz
@@ -2193,23 +2040,19 @@
       topLevelVariables
         x @21
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -2217,12 +2060,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -2307,63 +2148,51 @@
       topLevelVariables
         m @19
           reference: <testLibraryFragment>::@topLevelVariable::m
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::m
           setter2: <testLibraryFragment>::@setter::m
         n @53
           reference: <testLibraryFragment>::@topLevelVariable::n
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::n
           setter2: <testLibraryFragment>::@setter::n
         x @73
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get m @-1
           reference: <testLibraryFragment>::@getter::m
-          enclosingFragment: <testLibraryFragment>
         get n @-1
           reference: <testLibraryFragment>::@getter::n
-          enclosingFragment: <testLibraryFragment>
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set m= @-1
           reference: <testLibraryFragment>::@setter::m
-          enclosingFragment: <testLibraryFragment>
           parameters
             _m @-1
         set n= @-1
           reference: <testLibraryFragment>::@setter::n
-          enclosingFragment: <testLibraryFragment>
           parameters
             _n @-1
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     m
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function<T>()?
       firstFragment: <testLibraryFragment>::@topLevelVariable::m
       getter: <none>
       setter: <none>
     n
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function<T>()
       firstFragment: <testLibraryFragment>::@topLevelVariable::n
       getter: <none>
       setter: <none>
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -2371,20 +2200,16 @@
   getters
     synthetic static get m
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::m
     synthetic static get n
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::n
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set m=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _m
           reference: <none>
@@ -2392,7 +2217,6 @@
       firstFragment: <testLibraryFragment>::@setter::m
     synthetic static set n=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _n
           reference: <none>
@@ -2400,7 +2224,6 @@
       firstFragment: <testLibraryFragment>::@setter::n
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -2462,23 +2285,19 @@
       topLevelVariables
         m @30
           reference: <testLibraryFragment>::@topLevelVariable::m
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::m
           setter2: <testLibraryFragment>::@setter::m
       getters
         get m @-1
           reference: <testLibraryFragment>::@getter::m
-          enclosingFragment: <testLibraryFragment>
       setters
         set m= @-1
           reference: <testLibraryFragment>::@setter::m
-          enclosingFragment: <testLibraryFragment>
           parameters
             _m @-1
   topLevelVariables
     m
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: HashMap<dynamic, dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::m
       getter: <none>
@@ -2486,12 +2305,10 @@
   getters
     synthetic static get m
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::m
   setters
     synthetic static set m=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _m
           reference: <none>
@@ -2594,83 +2411,67 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
           setter2: <testLibraryFragment>::@setter::b
         c @34
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         d @49
           reference: <testLibraryFragment>::@topLevelVariable::d
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::d
           setter2: <testLibraryFragment>::@setter::d
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get d @-1
           reference: <testLibraryFragment>::@getter::d
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set b= @-1
           reference: <testLibraryFragment>::@setter::b
-          enclosingFragment: <testLibraryFragment>
           parameters
             _b @-1
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set d= @-1
           reference: <testLibraryFragment>::@setter::d
-          enclosingFragment: <testLibraryFragment>
           parameters
             _d @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
       setter: <none>
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     d
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::d
       getter: <none>
@@ -2678,24 +2479,19 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get d
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::d
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -2703,7 +2499,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set b=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _b
           reference: <none>
@@ -2711,7 +2506,6 @@
       firstFragment: <testLibraryFragment>::@setter::b
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -2719,7 +2513,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set d=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _d
           reference: <none>
@@ -2808,22 +2601,18 @@
           fields
             v @49
               reference: <testLibraryFragment>::@class::C::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::v
               setter2: <testLibraryFragment>::@class::C::@setter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::D::@constructor::new
           getters
             get v @-1
               reference: <testLibraryFragment>::@class::C::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set v= @-1
               reference: <testLibraryFragment>::@class::C::@setter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _v @-1
         class D @69
@@ -2831,26 +2620,21 @@
           fields
             v @-1
               reference: <testLibraryFragment>::@class::D::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::D
               getter2: <testLibraryFragment>::@class::D::@getter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           getters
             get v @79
               reference: <testLibraryFragment>::@class::D::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       fields
         v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int Function(String)
             alias: <testLibraryFragment>::@typeAlias::F
           firstFragment: <testLibraryFragment>::@class::C::@field::v
@@ -2864,12 +2648,10 @@
       getters
         synthetic get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::v
       setters
         synthetic set v=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _v
               reference: <none>
@@ -2878,12 +2660,10 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::v
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       fields
         synthetic v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: int Function(String)
             alias: <testLibraryFragment>::@typeAlias::F
           firstFragment: <testLibraryFragment>::@class::D::@field::v
@@ -2895,7 +2675,6 @@
       getters
         abstract get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           firstFragment: <testLibraryFragment>::@class::D::@getter::v
 ''');
   }
@@ -2949,23 +2728,19 @@
       topLevelVariables
         x @21
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -2973,12 +2748,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -3036,23 +2809,19 @@
       topLevelVariables
         x @21
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int?
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -3060,12 +2829,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -3123,23 +2890,19 @@
       topLevelVariables
         x @21
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: void Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -3147,12 +2910,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -3210,23 +2971,19 @@
       topLevelVariables
         x @21
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: void Function()?
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -3234,12 +2991,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -3331,24 +3086,20 @@
           fields
             v @37
               reference: <testLibraryFragment>::@class::C::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::v
               setter2: <testLibraryFragment>::@class::C::@setter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::D::@constructor::new
                 substitution: {U: int, V: T}
           getters
             get v @-1
               reference: <testLibraryFragment>::@class::C::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set v= @-1
               reference: <testLibraryFragment>::@class::C::@setter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _v @-1
         class D @57
@@ -3359,20 +3110,16 @@
           fields
             v @-1
               reference: <testLibraryFragment>::@class::D::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::D
               getter2: <testLibraryFragment>::@class::D::@getter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           getters
             get v @83
               reference: <testLibraryFragment>::@class::D::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::D
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -3380,7 +3127,6 @@
       fields
         v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: Map<T, int>
           firstFragment: <testLibraryFragment>::@class::C::@field::v
           getter: <none>
@@ -3393,12 +3139,10 @@
       getters
         synthetic get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::v
       setters
         synthetic set v=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _v
               reference: <none>
@@ -3406,7 +3150,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::v
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         U
         V
@@ -3414,7 +3157,6 @@
       fields
         synthetic v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: Map<V, U>
           firstFragment: <testLibraryFragment>::@class::D::@field::v
           getter: <none>
@@ -3425,7 +3167,6 @@
       getters
         abstract get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           firstFragment: <testLibraryFragment>::@class::D::@getter::v
 ''');
   }
@@ -3490,23 +3231,19 @@
       topLevelVariables
         v @53
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -3514,12 +3251,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -3609,14 +3344,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::D::@constructor::new
                 substitution: {V: U, W: int}
           methods
             f @41
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 x @47
                 g @50
@@ -3628,18 +3361,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           methods
             f @90
               reference: <testLibraryFragment>::@class::D::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::D
               parameters
                 x @96
                 g @101
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -3663,7 +3393,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@method::f
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       typeParameters
         V
         W
@@ -3754,19 +3483,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: package:test/a.dart::<fragment>::@class::D::@constructor::new
           methods
             f @44
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 x @50
                 g @53
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       constructors
@@ -3849,12 +3575,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::D::@constructor::new
           methods
             f @25
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 x @31
                 g @34
@@ -3863,18 +3587,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           methods
             f @66
               reference: <testLibraryFragment>::@class::D::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::D
               parameters
                 x @72
                 g @79
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       constructors
@@ -3895,7 +3616,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@method::f
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         synthetic new
@@ -3970,23 +3690,19 @@
       topLevelVariables
         v @40
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -3994,12 +3710,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -4060,23 +3774,19 @@
       topLevelVariables
         v @42
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -4084,12 +3794,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -4165,17 +3873,14 @@
           fields
             f @-1
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::D::@constructor::new
           setters
             set f= @29
               reference: <testLibraryFragment>::@class::C::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 g @31
         class D @54
@@ -4183,28 +3888,23 @@
           fields
             f @-1
               reference: <testLibraryFragment>::@class::D::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::D
               setter2: <testLibraryFragment>::@class::D::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           setters
             set f= @67
               reference: <testLibraryFragment>::@class::D::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::D
               parameters
                 g @73
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: D
       fields
         synthetic f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int Function(String)
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           setter: <none>
@@ -4216,7 +3916,6 @@
       setters
         set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional g
               reference: <none>
@@ -4224,12 +3923,10 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::f
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       fields
         synthetic f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: int Function(String)
           firstFragment: <testLibraryFragment>::@class::D::@field::f
           setter: <none>
@@ -4240,7 +3937,6 @@
       setters
         abstract set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           parameters
             requiredPositional g
               reference: <none>
@@ -4312,18 +4008,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: package:test/a.dart::<fragment>::@class::A::@constructor::new
           methods
             m @39
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 p @41
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -4423,45 +4116,36 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
             named @21
               reference: <testLibraryFragment>::@class::A::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::A
               periodOffset: 20
               nameEnd: 26
       topLevelVariables
         a1 @36
           reference: <testLibraryFragment>::@topLevelVariable::a1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a1
           setter2: <testLibraryFragment>::@setter::a1
         a2 @50
           reference: <testLibraryFragment>::@topLevelVariable::a2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a2
           setter2: <testLibraryFragment>::@setter::a2
       getters
         get a1 @-1
           reference: <testLibraryFragment>::@getter::a1
-          enclosingFragment: <testLibraryFragment>
         get a2 @-1
           reference: <testLibraryFragment>::@getter::a2
-          enclosingFragment: <testLibraryFragment>
       setters
         set a1= @-1
           reference: <testLibraryFragment>::@setter::a1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a1 @-1
         set a2= @-1
           reference: <testLibraryFragment>::@setter::a2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a2 @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -4473,14 +4157,12 @@
   topLevelVariables
     a1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::a1
       getter: <none>
       setter: <none>
     a2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::a2
       getter: <none>
@@ -4488,16 +4170,13 @@
   getters
     synthetic static get a1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a1
     synthetic static get a2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a2
   setters
     synthetic static set a1=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a1
           reference: <none>
@@ -4505,7 +4184,6 @@
       firstFragment: <testLibraryFragment>::@setter::a1
     synthetic static set a2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a2
           reference: <none>
@@ -4598,43 +4276,35 @@
       topLevelVariables
         a1 @30
           reference: <testLibraryFragment>::@topLevelVariable::a1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a1
           setter2: <testLibraryFragment>::@setter::a1
         a2 @48
           reference: <testLibraryFragment>::@topLevelVariable::a2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a2
           setter2: <testLibraryFragment>::@setter::a2
       getters
         get a1 @-1
           reference: <testLibraryFragment>::@getter::a1
-          enclosingFragment: <testLibraryFragment>
         get a2 @-1
           reference: <testLibraryFragment>::@getter::a2
-          enclosingFragment: <testLibraryFragment>
       setters
         set a1= @-1
           reference: <testLibraryFragment>::@setter::a1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a1 @-1
         set a2= @-1
           reference: <testLibraryFragment>::@setter::a2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a2 @-1
   topLevelVariables
     a1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::a1
       getter: <none>
       setter: <none>
     a2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::a2
       getter: <none>
@@ -4642,16 +4312,13 @@
   getters
     synthetic static get a1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a1
     synthetic static get a2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a2
   setters
     synthetic static set a1=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a1
           reference: <none>
@@ -4659,7 +4326,6 @@
       firstFragment: <testLibraryFragment>::@setter::a1
     synthetic static set a2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a2
           reference: <none>
@@ -4730,23 +4396,19 @@
       topLevelVariables
         v @71
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<Object Function(int Function(String))>
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -4754,12 +4416,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -4863,54 +4523,44 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @25
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @48
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @61
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @84
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @121
           reference: <testLibraryFragment>::@class::D
           fields
             f @141
               reference: <testLibraryFragment>::@class::D::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::D
               getter2: <testLibraryFragment>::@class::D::@getter::f
               setter2: <testLibraryFragment>::@class::D::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
               superConstructor: <testLibraryFragment>::@class::C::@constructor::new
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::D::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::D
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::D::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::D
               parameters
                 _f @-1
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -4922,7 +4572,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -4934,7 +4583,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::m
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -4942,13 +4590,11 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     abstract class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       supertype: C
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::D::@field::f
           getter: <none>
@@ -4961,12 +4607,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           firstFragment: <testLibraryFragment>::@class::D::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           parameters
             requiredPositional _f
               reference: <none>
@@ -5058,53 +4702,43 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             call @19
               reference: <testLibraryFragment>::@class::A::@method::call
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @42
           reference: <testLibraryFragment>::@class::B
           fields
             a @50
               reference: <testLibraryFragment>::@class::B::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::a
               setter2: <testLibraryFragment>::@class::B::@setter::a
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::B::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set a= @-1
               reference: <testLibraryFragment>::@class::B::@setter::a
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _a @-1
       topLevelVariables
         c @59
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -5116,12 +4750,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::call
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: A
           firstFragment: <testLibraryFragment>::@class::B::@field::a
           getter: <none>
@@ -5133,12 +4765,10 @@
       getters
         synthetic get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::a
       setters
         synthetic set a=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _a
               reference: <none>
@@ -5147,7 +4777,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -5155,12 +4784,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -5226,43 +4853,35 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         b @42
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
           setter2: <testLibraryFragment>::@setter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set b= @-1
           reference: <testLibraryFragment>::@setter::b
-          enclosingFragment: <testLibraryFragment>
           parameters
             _b @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
@@ -5270,16 +4889,13 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -5287,7 +4903,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set b=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _b
           reference: <none>
@@ -5358,23 +4973,19 @@
       topLevelVariables
         x @35
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<dynamic> Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -5382,12 +4993,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -5433,23 +5042,19 @@
       topLevelVariables
         x @4
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function(int Function(String))
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -5457,12 +5062,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -5508,23 +5111,19 @@
       topLevelVariables
         x @4
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function(int Function(String))
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -5532,12 +5131,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -5596,23 +5193,19 @@
       topLevelVariables
         y @21
           reference: <testLibraryFragment>::@topLevelVariable::y
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::y
           setter2: <testLibraryFragment>::@setter::y
       getters
         get y @-1
           reference: <testLibraryFragment>::@getter::y
-          enclosingFragment: <testLibraryFragment>
       setters
         set y= @-1
           reference: <testLibraryFragment>::@setter::y
-          enclosingFragment: <testLibraryFragment>
           parameters
             _y @-1
   topLevelVariables
     y
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::y
       getter: <none>
@@ -5620,12 +5213,10 @@
   getters
     synthetic static get y
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::y
   setters
     synthetic static set y=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _y
           reference: <none>
@@ -5691,38 +5282,30 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
             y @51
               reference: <testLibraryFragment>::@class::A::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::y
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
             get y @-1
               reference: <testLibraryFragment>::@class::A::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
         static final y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::A::@field::y
           getter: <none>
@@ -5733,11 +5316,9 @@
       getters
         synthetic static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
         synthetic static get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::y
 ''');
   }
@@ -5809,51 +5390,40 @@
           fields
             a @25
               reference: <testLibraryFragment>::@class::A::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::a
             b @49
               reference: <testLibraryFragment>::@class::A::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::b
             c @66
               reference: <testLibraryFragment>::@class::A::@field::c
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::c
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::A::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::A
             get b @-1
               reference: <testLibraryFragment>::@class::A::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::A
             get c @-1
               reference: <testLibraryFragment>::@class::A::@getter::c
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static final a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::A::@field::a
           getter: <none>
         static final b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: A
           firstFragment: <testLibraryFragment>::@class::A::@field::b
           getter: <none>
         final c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::A::@field::c
           getter: <none>
@@ -5864,15 +5434,12 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::a
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::b
         synthetic get c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::c
 ''');
   }
@@ -5966,21 +5533,17 @@
           fields
             value @17
               reference: <testLibraryFragment>::@class::A::@field::value
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::value
               setter2: <testLibraryFragment>::@class::A::@setter::value
           constructors
             new @27
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get value @-1
               reference: <testLibraryFragment>::@class::A::@getter::value
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set value= @-1
               reference: <testLibraryFragment>::@class::A::@setter::value
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _value @-1
         class B @51
@@ -5988,34 +5551,28 @@
           fields
             a @61
               reference: <testLibraryFragment>::@class::B::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::a
               setter2: <testLibraryFragment>::@class::B::@setter::a
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::B::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set a= @-1
               reference: <testLibraryFragment>::@class::B::@setter::a
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _a @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
       fields
         value
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: T
           firstFragment: <testLibraryFragment>::@class::A::@field::value
           getter: <none>
@@ -6031,12 +5588,10 @@
       getters
         synthetic get value
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::value
       setters
         synthetic set value=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _value
               reference: <none>
@@ -6044,12 +5599,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::value
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: A<String>
           firstFragment: <testLibraryFragment>::@class::B::@field::a
           getter: <none>
@@ -6061,12 +5614,10 @@
       getters
         synthetic get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::a
       setters
         synthetic set a=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _a
               reference: <none>
@@ -6205,21 +5756,17 @@
           fields
             value @17
               reference: <testLibraryFragment>::@class::A::@field::value
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::value
               setter2: <testLibraryFragment>::@class::A::@setter::value
           constructors
             new @27
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get value @-1
               reference: <testLibraryFragment>::@class::A::@getter::value
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set value= @-1
               reference: <testLibraryFragment>::@class::A::@setter::value
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _value @-1
         class B @51
@@ -6229,7 +5776,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -6250,21 +5796,17 @@
           fields
             a @88
               reference: <testLibraryFragment>::@class::C::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::a
               setter2: <testLibraryFragment>::@class::C::@setter::a
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::C::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set a= @-1
               reference: <testLibraryFragment>::@class::C::@setter::a
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _a @-1
       mixins
@@ -6273,14 +5815,12 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
       fields
         value
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: T
           firstFragment: <testLibraryFragment>::@class::A::@field::value
           getter: <none>
@@ -6296,12 +5836,10 @@
       getters
         synthetic get value
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::value
       setters
         synthetic set value=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _value
               reference: <none>
@@ -6309,7 +5847,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::value
     class alias B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -6325,12 +5862,10 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: B<int>
           firstFragment: <testLibraryFragment>::@class::C::@field::a
           getter: <none>
@@ -6342,12 +5877,10 @@
       getters
         synthetic get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::a
       setters
         synthetic set a=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _a
               reference: <none>
@@ -6356,7 +5889,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -6423,34 +5955,28 @@
           fields
             f @19
               reference: <testLibraryFragment>::@class::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::f
               setter2: <testLibraryFragment>::@class::A::@setter::f
           constructors
             new @28
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::A::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _f @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::f
           getter: <none>
@@ -6466,12 +5992,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _f
               reference: <none>
@@ -6541,27 +6065,21 @@
           constructors
             new @12
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         final a @26
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         final b @48
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -6574,24 +6092,20 @@
   topLevelVariables
     final a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     final b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
 ''');
   }
@@ -6654,23 +6168,19 @@
       topLevelVariables
         v @38
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -6678,12 +6188,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -6729,23 +6237,19 @@
       topLevelVariables
         x @4
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function(dynamic) Function(dynamic)
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -6753,12 +6257,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -6804,23 +6306,19 @@
       topLevelVariables
         x @4
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function(int) Function(int)
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -6828,12 +6326,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -6879,23 +6375,19 @@
       topLevelVariables
         x @4
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function([dynamic])
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -6903,12 +6395,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -6972,57 +6462,45 @@
       topLevelVariables
         final a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         final b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
         final c @32
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     final b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
     final c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
 ''');
   }
@@ -7082,57 +6560,45 @@
       topLevelVariables
         final a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         final b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
         final c @32
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     final b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
     final c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
 ''');
   }
@@ -7207,74 +6673,58 @@
       topLevelVariables
         final a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         final b @23
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
         final c @36
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
         final d @49
           reference: <testLibraryFragment>::@topLevelVariable::d
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::d
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get d @-1
           reference: <testLibraryFragment>::@getter::d
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     final b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
     final c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
     final d
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::d
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get d
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::d
 ''');
   }
@@ -7342,57 +6792,45 @@
       topLevelVariables
         final a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         final b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
         final c @36
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     final b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
     final c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
 ''');
   }
@@ -7491,13 +6929,11 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @18
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
         class C @40
           reference: <testLibraryFragment>::@class::C
@@ -7506,36 +6942,28 @@
           fields
             f @67
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
           constructors
             const new @78
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         final b @98
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
         final c @113
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
       getters
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -7543,7 +6971,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -7553,7 +6980,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: A
@@ -7561,7 +6987,6 @@
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: T
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -7576,29 +7001,24 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
   topLevelVariables
     final b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: B
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
     final c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<B>
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
   getters
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
 ''');
   }
@@ -7661,49 +7081,40 @@
           fields
             foo @-1
               reference: <testLibraryFragment>::@extension::0::@field::foo
-              enclosingFragment: <testLibraryFragment>::@extension::0
               getter2: <testLibraryFragment>::@extension::0::@getter::foo
           getters
             get foo @32
               reference: <testLibraryFragment>::@extension::0::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@extension::0
       topLevelVariables
         v @48
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   extensions
     extension <null>
       reference: <testLibraryFragment>::@extension::0
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@extension::0
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::0
           type: int
           firstFragment: <testLibraryFragment>::@extension::0::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@extension::0
           firstFragment: <testLibraryFragment>::@extension::0::@getter::foo
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -7711,12 +7122,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -7816,40 +7225,32 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         V2 @56
           reference: <testLibraryFragment>::@topLevelVariable::V2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V2
           setter2: <testLibraryFragment>::@setter::V2
         V @71
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
           setter2: <testLibraryFragment>::@setter::V
       getters
         get V2 @-1
           reference: <testLibraryFragment>::@getter::V2
-          enclosingFragment: <testLibraryFragment>
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
       setters
         set V2= @-1
           reference: <testLibraryFragment>::@setter::V2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _V2 @-1
         set V= @-1
           reference: <testLibraryFragment>::@setter::V
-          enclosingFragment: <testLibraryFragment>
           parameters
             _V @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: dynamic
@@ -7861,14 +7262,12 @@
   topLevelVariables
     V2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::V2
       getter: <none>
       setter: <none>
     V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
@@ -7876,16 +7275,13 @@
   getters
     synthetic static get V2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V2
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
   setters
     synthetic static set V2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _V2
           reference: <none>
@@ -7893,7 +7289,6 @@
       firstFragment: <testLibraryFragment>::@setter::V2
     synthetic static set V=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _V
           reference: <none>
@@ -7954,43 +7349,35 @@
       topLevelVariables
         V @4
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
           setter2: <testLibraryFragment>::@setter::V
         V2 @22
           reference: <testLibraryFragment>::@topLevelVariable::V2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V2
           setter2: <testLibraryFragment>::@setter::V2
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
         get V2 @-1
           reference: <testLibraryFragment>::@getter::V2
-          enclosingFragment: <testLibraryFragment>
       setters
         set V= @-1
           reference: <testLibraryFragment>::@setter::V
-          enclosingFragment: <testLibraryFragment>
           parameters
             _V @-1
         set V2= @-1
           reference: <testLibraryFragment>::@setter::V2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _V2 @-1
   topLevelVariables
     V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
       setter: <none>
     V2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::V2
       getter: <none>
@@ -7998,16 +7385,13 @@
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
     synthetic static get V2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V2
   setters
     synthetic static set V=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _V
           reference: <none>
@@ -8015,7 +7399,6 @@
       firstFragment: <testLibraryFragment>::@setter::V
     synthetic static set V2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _V2
           reference: <none>
@@ -8069,17 +7452,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @15
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 p @21
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
@@ -8134,23 +7514,19 @@
       topLevelVariables
         v @4
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -8158,12 +7534,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -8206,23 +7580,19 @@
       topLevelVariables
         d @6
           reference: <testLibraryFragment>::@topLevelVariable::d
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::d
           setter2: <testLibraryFragment>::@setter::d
       getters
         get d @-1
           reference: <testLibraryFragment>::@getter::d
-          enclosingFragment: <testLibraryFragment>
       setters
         set d= @-1
           reference: <testLibraryFragment>::@setter::d
-          enclosingFragment: <testLibraryFragment>
           parameters
             _d @-1
   topLevelVariables
     d
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Never
       firstFragment: <testLibraryFragment>::@topLevelVariable::d
       getter: <none>
@@ -8230,12 +7600,10 @@
   getters
     synthetic static get d
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::d
   setters
     synthetic static set d=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _d
           reference: <none>
@@ -8298,34 +7666,28 @@
           fields
             t @17
               reference: <testLibraryFragment>::@class::C::@field::t
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::t
               setter2: <testLibraryFragment>::@class::C::@setter::t
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get t @-1
               reference: <testLibraryFragment>::@class::C::@getter::t
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set t= @-1
               reference: <testLibraryFragment>::@class::C::@setter::t
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _t @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
       fields
         t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: T
           firstFragment: <testLibraryFragment>::@class::C::@field::t
           getter: <none>
@@ -8337,12 +7699,10 @@
       getters
         synthetic get t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::t
       setters
         synthetic set t=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _t
               reference: <none>
@@ -8405,34 +7765,28 @@
           fields
             t @18
               reference: <testLibraryFragment>::@class::C::@field::t
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::t
               setter2: <testLibraryFragment>::@class::C::@setter::t
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get t @-1
               reference: <testLibraryFragment>::@class::C::@getter::t
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set t= @-1
               reference: <testLibraryFragment>::@class::C::@setter::t
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _t @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::C
       fields
         t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: T?
           firstFragment: <testLibraryFragment>::@class::C::@field::t
           getter: <none>
@@ -8444,12 +7798,10 @@
       getters
         synthetic get t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::t
       setters
         synthetic set t=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _t
               reference: <none>
@@ -8598,76 +7950,60 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       enums
         enum E @16
           reference: <testLibraryFragment>::@enum::E
           fields
             enumConstant v @20
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         c @39
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         e @44
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
         f @49
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -8676,19 +8012,16 @@
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -8699,30 +8032,25 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: <testLibraryFragment>::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -8731,20 +8059,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -8752,7 +8076,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -8760,7 +8083,6 @@
       firstFragment: <testLibraryFragment>::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -8919,43 +8241,34 @@
       topLevelVariables
         c @28
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         e @33
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
         f @38
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
     <testLibrary>::@fragment::package:test/a.dart
@@ -8966,34 +8279,27 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::C::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::C
       enums
         enum E @27
           reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           fields
             enumConstant v @31
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::v
             values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           getters
             get v @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
             get values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
   classes
     class C
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::C
       constructors
         synthetic new
@@ -9002,19 +8308,16 @@
   enums
     enum E
       reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           type: E
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           type: List<E>
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::values
           getter: <none>
@@ -9025,30 +8328,25 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::values
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: <testLibrary>::@fragment::package:test/a.dart::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -9057,20 +8355,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -9078,7 +8372,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -9086,7 +8379,6 @@
       firstFragment: <testLibraryFragment>::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -9247,78 +8539,62 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       enums
         enum E @42
           reference: <testLibraryFragment>::@enum::E
           fields
             enumConstant v @46
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
     <testLibrary>::@fragment::package:test/a.dart
       previousFragment: <testLibraryFragment>
       topLevelVariables
         c @13
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::c
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::c
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::c
         e @18
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::e
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::e
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::e
         f @23
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::f
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::f
       getters
         get c @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::c
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
         get e @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::e
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
         get f @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
       setters
         set c= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::c
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _c @-1
         set e= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::e
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _e @-1
         set f= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _f @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -9327,19 +8603,16 @@
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -9350,30 +8623,25 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: <testLibraryFragment>::@typeAlias::F
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::f
@@ -9382,20 +8650,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -9403,7 +8667,6 @@
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -9411,7 +8674,6 @@
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -9586,78 +8848,62 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::C::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::C
       enums
         enum E @27
           reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           fields
             enumConstant v @31
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::v
             values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           getters
             get v @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
             get values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
     <testLibrary>::@fragment::package:test/b.dart
       previousFragment: <testLibrary>::@fragment::package:test/a.dart
       topLevelVariables
         c @13
           reference: <testLibrary>::@fragment::package:test/b.dart::@topLevelVariable::c
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
           getter2: <testLibrary>::@fragment::package:test/b.dart::@getter::c
           setter2: <testLibrary>::@fragment::package:test/b.dart::@setter::c
         e @18
           reference: <testLibrary>::@fragment::package:test/b.dart::@topLevelVariable::e
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
           getter2: <testLibrary>::@fragment::package:test/b.dart::@getter::e
           setter2: <testLibrary>::@fragment::package:test/b.dart::@setter::e
         f @23
           reference: <testLibrary>::@fragment::package:test/b.dart::@topLevelVariable::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
           getter2: <testLibrary>::@fragment::package:test/b.dart::@getter::f
           setter2: <testLibrary>::@fragment::package:test/b.dart::@setter::f
       getters
         get c @-1
           reference: <testLibrary>::@fragment::package:test/b.dart::@getter::c
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
         get e @-1
           reference: <testLibrary>::@fragment::package:test/b.dart::@getter::e
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
         get f @-1
           reference: <testLibrary>::@fragment::package:test/b.dart::@getter::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
       setters
         set c= @-1
           reference: <testLibrary>::@fragment::package:test/b.dart::@setter::c
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
           parameters
             _c @-1
         set e= @-1
           reference: <testLibrary>::@fragment::package:test/b.dart::@setter::e
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
           parameters
             _e @-1
         set f= @-1
           reference: <testLibrary>::@fragment::package:test/b.dart::@setter::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/b.dart
           parameters
             _f @-1
   classes
     class C
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::C
       constructors
         synthetic new
@@ -9666,19 +8912,16 @@
   enums
     enum E
       reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           type: E
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           type: List<E>
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::values
           getter: <none>
@@ -9689,30 +8932,25 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::values
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: <testLibrary>::@fragment::package:test/a.dart::@typeAlias::F
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@topLevelVariable::f
@@ -9721,20 +8959,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -9742,7 +8976,6 @@
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -9750,7 +8983,6 @@
       firstFragment: <testLibrary>::@fragment::package:test/b.dart::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -9913,76 +9145,60 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@class::C::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@class::C
       enums
         enum E @27
           reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           fields
             enumConstant v @31
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::v
             values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
               getter2: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           getters
             get v @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::v
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
             get values @-1
               reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::values
-              enclosingFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
       topLevelVariables
         c @50
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::c
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::c
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::c
         e @55
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::e
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::e
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::e
         f @60
           reference: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           getter2: <testLibrary>::@fragment::package:test/a.dart::@getter::f
           setter2: <testLibrary>::@fragment::package:test/a.dart::@setter::f
       getters
         get c @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::c
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
         get e @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::e
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
         get f @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@getter::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
       setters
         set c= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::c
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _c @-1
         set e= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::e
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _e @-1
         set f= @-1
           reference: <testLibrary>::@fragment::package:test/a.dart::@setter::f
-          enclosingFragment: <testLibrary>::@fragment::package:test/a.dart
           parameters
             _f @-1
   classes
     class C
       reference: <testLibrary>::@fragment::package:test/a.dart::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::C
       constructors
         synthetic new
@@ -9991,19 +9207,16 @@
   enums
     enum E
       reference: <testLibrary>::@fragment::package:test/a.dart::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           type: E
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           type: List<E>
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@field::values
           getter: <none>
@@ -10014,30 +9227,25 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibrary>::@fragment::package:test/a.dart::@enum::E
           firstFragment: <testLibrary>::@fragment::package:test/a.dart::@enum::E::@getter::values
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: <testLibrary>::@fragment::package:test/a.dart::@typeAlias::F
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@topLevelVariable::f
@@ -10046,20 +9254,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -10067,7 +9271,6 @@
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -10075,7 +9278,6 @@
       firstFragment: <testLibrary>::@fragment::package:test/a.dart::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -10130,27 +9332,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @13
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -10159,7 +9356,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -10167,12 +9363,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -10234,27 +9428,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @32
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -10266,7 +9455,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -10274,12 +9462,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -10341,27 +9527,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @19
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -10373,7 +9554,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<dynamic, dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -10381,12 +9561,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -10482,55 +9660,44 @@
           fields
             enumConstant v @9
               reference: <testLibraryFragment>::@enum::E::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::E::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
               getter2: <testLibraryFragment>::@enum::E::@getter::values
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@enum::E::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@enum::E
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::E::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::E
             get values @-1
               reference: <testLibraryFragment>::@enum::E::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::E
       topLevelVariables
         e @15
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
       getters
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
       setters
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
   enums
     enum E
       reference: <testLibraryFragment>::@enum::E
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::E
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: E
           firstFragment: <testLibraryFragment>::@enum::E::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           type: List<E>
           firstFragment: <testLibraryFragment>::@enum::E::@field::values
           getter: <none>
@@ -10541,16 +9708,13 @@
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::E
           firstFragment: <testLibraryFragment>::@enum::E::@getter::values
   topLevelVariables
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
@@ -10558,12 +9722,10 @@
   getters
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
   setters
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -10651,63 +9813,51 @@
       topLevelVariables
         c @19
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         e @24
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
         f @29
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: package:test/a.dart::<fragment>::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -10716,20 +9866,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -10737,7 +9883,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -10745,7 +9890,6 @@
       firstFragment: <testLibraryFragment>::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -10835,63 +9979,51 @@
       topLevelVariables
         c @19
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         e @24
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
         f @29
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: package:test/b.dart::<fragment>::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -10900,20 +10032,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -10921,7 +10049,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -10929,7 +10056,6 @@
       firstFragment: <testLibraryFragment>::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -11020,63 +10146,51 @@
       topLevelVariables
         c @19
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         e @24
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
         f @29
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: package:test/c.dart::<fragment>::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -11085,20 +10199,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -11106,7 +10216,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -11114,7 +10223,6 @@
       firstFragment: <testLibraryFragment>::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -11205,63 +10313,51 @@
       topLevelVariables
         c @21
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         e @26
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
         f @31
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: package:test/a/c/c.dart::<fragment>::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -11270,20 +10366,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -11291,7 +10383,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -11299,7 +10390,6 @@
       firstFragment: <testLibraryFragment>::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -11389,63 +10479,51 @@
       topLevelVariables
         c @21
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         e @26
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
         f @31
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: package:test/a/b/b.dart::<fragment>::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -11454,20 +10532,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -11475,7 +10549,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -11483,7 +10556,6 @@
       firstFragment: <testLibraryFragment>::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -11573,63 +10645,51 @@
       topLevelVariables
         c @19
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         e @24
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
         f @29
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: package:test/a.dart::@fragment::package:test/b.dart::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -11638,20 +10698,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -11659,7 +10715,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -11667,7 +10722,6 @@
       firstFragment: <testLibraryFragment>::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -11740,43 +10794,35 @@
       topLevelVariables
         c1 @20
           reference: <testLibraryFragment>::@topLevelVariable::c1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c1
           setter2: <testLibraryFragment>::@setter::c1
         c2 @27
           reference: <testLibraryFragment>::@topLevelVariable::c2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c2
           setter2: <testLibraryFragment>::@setter::c2
       getters
         get c1 @-1
           reference: <testLibraryFragment>::@getter::c1
-          enclosingFragment: <testLibraryFragment>
         get c2 @-1
           reference: <testLibraryFragment>::@getter::c2
-          enclosingFragment: <testLibraryFragment>
       setters
         set c1= @-1
           reference: <testLibraryFragment>::@setter::c1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c1 @-1
         set c2= @-1
           reference: <testLibraryFragment>::@setter::c2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c2 @-1
   topLevelVariables
     c1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C1
       firstFragment: <testLibraryFragment>::@topLevelVariable::c1
       getter: <none>
       setter: <none>
     c2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C2
       firstFragment: <testLibraryFragment>::@topLevelVariable::c2
       getter: <none>
@@ -11784,16 +10830,13 @@
   getters
     synthetic static get c1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c1
     synthetic static get c2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c2
   setters
     synthetic static set c1=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c1
           reference: <none>
@@ -11801,7 +10844,6 @@
       firstFragment: <testLibraryFragment>::@setter::c1
     synthetic static set c2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c2
           reference: <none>
@@ -11890,63 +10932,51 @@
       topLevelVariables
         c @21
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         e @26
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
         f @31
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: package:test/a/b.dart::@fragment::package:test/a/c.dart::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -11955,20 +10985,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -11976,7 +11002,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -11984,7 +11009,6 @@
       firstFragment: <testLibraryFragment>::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -12073,63 +11097,51 @@
       topLevelVariables
         c @19
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         e @24
           reference: <testLibraryFragment>::@topLevelVariable::e
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::e
           setter2: <testLibraryFragment>::@setter::e
         f @29
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get e @-1
           reference: <testLibraryFragment>::@getter::e
-          enclosingFragment: <testLibraryFragment>
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set e= @-1
           reference: <testLibraryFragment>::@setter::e
-          enclosingFragment: <testLibraryFragment>
           parameters
             _e @-1
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     e
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: E
       firstFragment: <testLibraryFragment>::@topLevelVariable::e
       getter: <none>
       setter: <none>
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: package:test/a.dart::<fragment>::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -12138,20 +11150,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get e
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::e
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -12159,7 +11167,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set e=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _e
           reference: <none>
@@ -12167,7 +11174,6 @@
       firstFragment: <testLibraryFragment>::@setter::e
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -12220,23 +11226,19 @@
       topLevelVariables
         f @15
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function()
         alias: <testLibraryFragment>::@typeAlias::F
       firstFragment: <testLibraryFragment>::@topLevelVariable::f
@@ -12245,12 +11247,10 @@
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -12321,23 +11321,19 @@
       topLevelVariables
         f @39
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String Function(int)
         alias: <testLibraryFragment>::@typeAlias::F
           typeArguments
@@ -12349,12 +11345,10 @@
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -12427,23 +11421,19 @@
       topLevelVariables
         f @26
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function(dynamic)
         alias: <testLibraryFragment>::@typeAlias::F
           typeArguments
@@ -12455,12 +11445,10 @@
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
diff --git a/pkg/analyzer/test/src/summary/elements/types_test.dart b/pkg/analyzer/test/src/summary/elements/types_test.dart
index fe1195c..41aeeee 100644
--- a/pkg/analyzer/test/src/summary/elements/types_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/types_test.dart
@@ -128,23 +128,19 @@
       topLevelVariables
         x @35
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: FutureOr<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -152,12 +148,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -213,23 +207,19 @@
       topLevelVariables
         const x @27
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Type
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
     var variables = library.definingCompilationUnit.topLevelVariables;
@@ -310,43 +300,35 @@
       topLevelVariables
         x @52
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
         y @65
           reference: <testLibraryFragment>::@topLevelVariable::y
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::y
           setter2: <testLibraryFragment>::@setter::y
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
         get y @-1
           reference: <testLibraryFragment>::@getter::y
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
         set y= @-1
           reference: <testLibraryFragment>::@setter::y
-          enclosingFragment: <testLibraryFragment>
           parameters
             _y @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: FutureOr<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
       setter: <none>
     y
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::y
       getter: <none>
@@ -354,16 +336,13 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
     synthetic static get y
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::y
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -371,7 +350,6 @@
       firstFragment: <testLibraryFragment>::@setter::x
     synthetic static set y=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _y
           reference: <none>
@@ -446,11 +424,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @30
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               typeParameters
                 V @32
                 W @35
@@ -460,7 +436,6 @@
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -568,17 +543,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             call @17
               reference: <testLibraryFragment>::@class::C::@method::call
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @36
           reference: <testLibraryFragment>::@class::D
           constructors
             const new @48
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
               constantInitializers
                 RedirectingConstructorInvocation
                   thisKeyword: this @57
@@ -602,13 +574,11 @@
               redirectedConstructor: <testLibraryFragment>::@class::D::@constructor::named
             const named @83
               reference: <testLibraryFragment>::@class::D::@constructor::named
-              enclosingFragment: <testLibraryFragment>::@class::D
               periodOffset: 82
               nameEnd: 88
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -620,7 +590,6 @@
           firstFragment: <testLibraryFragment>::@class::C::@method::call
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       constructors
         const new
@@ -676,23 +645,19 @@
       topLevelVariables
         v @4
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -700,12 +665,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -749,23 +712,19 @@
       topLevelVariables
         v @4
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<dynamic> Function(dynamic)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -773,12 +732,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -836,23 +793,19 @@
       topLevelVariables
         v @25
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<int> Function(Future<Future<Future<int>>>)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -860,12 +813,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -922,23 +873,19 @@
       topLevelVariables
         v @25
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<int> Function(Future<int>)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -946,12 +893,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -1008,23 +953,19 @@
       topLevelVariables
         v @25
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<dynamic> Function(Future<dynamic>)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -1032,12 +973,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -1096,32 +1035,26 @@
           fields
             v @16
               reference: <testLibraryFragment>::@class::C::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::v
               setter2: <testLibraryFragment>::@class::C::@setter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get v @-1
               reference: <testLibraryFragment>::@class::C::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set v= @-1
               reference: <testLibraryFragment>::@class::C::@setter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _v @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int Function()
           firstFragment: <testLibraryFragment>::@class::C::@field::v
           getter: <none>
@@ -1133,12 +1066,10 @@
       getters
         synthetic get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::v
       setters
         synthetic set v=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _v
               reference: <none>
@@ -1278,12 +1209,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X1
               superConstructor: package:test/nullSafe.dart::<fragment>::@class::NullSafeDefault::@constructor::new
           methods
             == @74
               reference: <testLibraryFragment>::@class::X1::@method::==
-              enclosingFragment: <testLibraryFragment>::@class::X1
               parameters
                 other @77
         class X2 @102
@@ -1291,12 +1220,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X2::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X2
               superConstructor: package:test/nullSafe.dart::<fragment>::@class::NullSafeObject::@constructor::new
           methods
             == @145
               reference: <testLibraryFragment>::@class::X2::@method::==
-              enclosingFragment: <testLibraryFragment>::@class::X2
               parameters
                 other @148
         class X3 @173
@@ -1304,18 +1231,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X3::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X3
               superConstructor: package:test/nullSafe.dart::<fragment>::@class::NullSafeInt::@constructor::new
           methods
             == @213
               reference: <testLibraryFragment>::@class::X3::@method::==
-              enclosingFragment: <testLibraryFragment>::@class::X3
               parameters
                 other @216
   classes
     class X1
       reference: <testLibraryFragment>::@class::X1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X1
       supertype: NullSafeDefault
       constructors
@@ -1333,7 +1257,6 @@
           firstFragment: <testLibraryFragment>::@class::X1::@method::==
     class X2
       reference: <testLibraryFragment>::@class::X2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X2
       supertype: NullSafeObject
       constructors
@@ -1351,7 +1274,6 @@
           firstFragment: <testLibraryFragment>::@class::X2::@method::==
     class X3
       reference: <testLibraryFragment>::@class::X3
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X3
       supertype: NullSafeInt
       constructors
@@ -1428,27 +1350,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @47
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         S
           bound: num
@@ -1462,7 +1379,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<num, C<num, dynamic>>
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -1470,12 +1386,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -1583,62 +1497,50 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
         class B @56
           reference: <testLibraryFragment>::@class::B
           fields
             c3 @66
               reference: <testLibraryFragment>::@class::B::@field::c3
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::c3
               setter2: <testLibraryFragment>::@class::B::@setter::c3
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get c3 @-1
               reference: <testLibraryFragment>::@class::B::@getter::c3
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set c3= @-1
               reference: <testLibraryFragment>::@class::B::@setter::c3
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _c3 @-1
       topLevelVariables
         c @29
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         c2 @36
           reference: <testLibraryFragment>::@topLevelVariable::c2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c2
           setter2: <testLibraryFragment>::@setter::c2
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get c2 @-1
           reference: <testLibraryFragment>::@getter::c2
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set c2= @-1
           reference: <testLibraryFragment>::@setter::c2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c2 @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<T>
@@ -1649,12 +1551,10 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         c3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: C<C<Object?>>
           firstFragment: <testLibraryFragment>::@class::B::@field::c3
           getter: <none>
@@ -1666,12 +1566,10 @@
       getters
         synthetic get c3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::c3
       setters
         synthetic set c3=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _c3
               reference: <none>
@@ -1680,14 +1578,12 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<C<dynamic>>
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     c2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<C<Object?>>
       firstFragment: <testLibraryFragment>::@topLevelVariable::c2
       getter: <none>
@@ -1695,16 +1591,13 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get c2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c2
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -1712,7 +1605,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set c2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c2
           reference: <none>
@@ -1779,27 +1671,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @47
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: C<T, U>
@@ -1813,7 +1700,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<C<dynamic, num>, num>
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -1821,12 +1707,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -1893,15 +1777,12 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             f @31
               reference: <testLibraryFragment>::@class::C::@method::f
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1973,23 +1854,19 @@
       topLevelVariables
         f @33
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic Function(num)
         alias: <testLibraryFragment>::@typeAlias::F
           typeArguments
@@ -2000,12 +1877,10 @@
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -2085,7 +1960,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @20
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -2094,27 +1968,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
       topLevelVariables
         b @69
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
           setter2: <testLibraryFragment>::@setter::b
       getters
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
       setters
         set b= @-1
           reference: <testLibraryFragment>::@setter::b
-          enclosingFragment: <testLibraryFragment>
           parameters
             _b @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -2124,7 +1993,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: int Function()
@@ -2138,7 +2006,6 @@
   topLevelVariables
     b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: B<int Function(), A<int Function()>>
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
@@ -2146,12 +2013,10 @@
   getters
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
   setters
     synthetic static set b=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _b
           reference: <none>
@@ -2221,23 +2086,19 @@
       topLevelVariables
         f @49
           reference: <testLibraryFragment>::@topLevelVariable::f
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::f
           setter2: <testLibraryFragment>::@setter::f
       getters
         get f @-1
           reference: <testLibraryFragment>::@getter::f
-          enclosingFragment: <testLibraryFragment>
       setters
         set f= @-1
           reference: <testLibraryFragment>::@setter::f
-          enclosingFragment: <testLibraryFragment>
           parameters
             _f @-1
   topLevelVariables
     f
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: S Function<S>(num)
         alias: <testLibraryFragment>::@typeAlias::F
           typeArguments
@@ -2248,12 +2109,10 @@
   getters
     synthetic static get f
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::f
   setters
     synthetic static set f=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _f
           reference: <none>
@@ -2326,16 +2185,13 @@
           fields
             values @31
               reference: <testLibraryFragment>::@class::A::@field::values
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::values
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get values @-1
               reference: <testLibraryFragment>::@class::A::@getter::values
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @55
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -2343,11 +2199,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         R
           bound: B<num>
@@ -2355,7 +2209,6 @@
       fields
         final values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: List<B<num>>
           firstFragment: <testLibraryFragment>::@class::A::@field::values
           getter: <none>
@@ -2366,11 +2219,9 @@
       getters
         synthetic get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::values
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: num
@@ -2436,27 +2287,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @28
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
           bound: num
@@ -2468,7 +2314,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C<num>
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -2476,12 +2321,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -2563,32 +2406,26 @@
           fields
             v @50
               reference: <testLibraryFragment>::@class::C::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::v
               setter2: <testLibraryFragment>::@class::C::@setter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get v @-1
               reference: <testLibraryFragment>::@class::C::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set v= @-1
               reference: <testLibraryFragment>::@class::C::@setter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _v @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: List<dynamic>
           firstFragment: <testLibraryFragment>::@class::C::@field::v
           getter: <none>
@@ -2600,12 +2437,10 @@
       getters
         synthetic get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::v
       setters
         synthetic set v=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _v
               reference: <none>
@@ -2771,23 +2606,19 @@
       topLevelVariables
         V @27
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
           setter2: <testLibraryFragment>::@setter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
       setters
         set V= @-1
           reference: <testLibraryFragment>::@setter::V
-          enclosingFragment: <testLibraryFragment>
           parameters
             _V @-1
   topLevelVariables
     V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
@@ -2795,12 +2626,10 @@
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
   setters
     synthetic static set V=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _V
           reference: <none>
@@ -2862,23 +2691,19 @@
       topLevelVariables
         v @19
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -2886,12 +2711,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -2954,23 +2777,19 @@
       topLevelVariables
         v @19
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -2978,12 +2797,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -3050,23 +2867,19 @@
       topLevelVariables
         v @19
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -3074,12 +2887,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -3141,18 +2952,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             g @23
               reference: <testLibraryFragment>::@class::C::@method::g
-              enclosingFragment: <testLibraryFragment>::@class::C
               typeParameters
                 V @25
                 W @28
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -3230,18 +3038,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             g @23
               reference: <testLibraryFragment>::@class::C::@method::g
-              enclosingFragment: <testLibraryFragment>::@class::C
               typeParameters
                 V @25
                 W @28
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -3397,23 +3202,19 @@
       topLevelVariables
         final v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function<T>(T)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -3516,27 +3317,22 @@
           fields
             v @22
               reference: <testLibraryFragment>::@class::C::@field::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::v
               setter2: <testLibraryFragment>::@class::C::@setter::v
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get v @-1
               reference: <testLibraryFragment>::@class::C::@getter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set v= @-1
               reference: <testLibraryFragment>::@class::C::@setter::v
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _v @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -3544,7 +3340,6 @@
       fields
         v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int Function(T, U)
           firstFragment: <testLibraryFragment>::@class::C::@field::v
           getter: <none>
@@ -3556,12 +3351,10 @@
       getters
         synthetic get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::v
       setters
         synthetic set v=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _v
               reference: <none>
@@ -3640,23 +3433,19 @@
       topLevelVariables
         final v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -3697,23 +3486,19 @@
       topLevelVariables
         final v @6
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function(int, String)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
 ''');
   }
@@ -3752,23 +3537,19 @@
       topLevelVariables
         m @22
           reference: <testLibraryFragment>::@topLevelVariable::m
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::m
           setter2: <testLibraryFragment>::@setter::m
       getters
         get m @-1
           reference: <testLibraryFragment>::@getter::m
-          enclosingFragment: <testLibraryFragment>
       setters
         set m= @-1
           reference: <testLibraryFragment>::@setter::m
-          enclosingFragment: <testLibraryFragment>
           parameters
             _m @-1
   topLevelVariables
     m
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<dynamic, dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::m
       getter: <none>
@@ -3776,12 +3557,10 @@
   getters
     synthetic static get m
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::m
   setters
     synthetic static set m=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _m
           reference: <none>
@@ -3824,23 +3603,19 @@
       topLevelVariables
         m @18
           reference: <testLibraryFragment>::@topLevelVariable::m
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::m
           setter2: <testLibraryFragment>::@setter::m
       getters
         get m @-1
           reference: <testLibraryFragment>::@getter::m
-          enclosingFragment: <testLibraryFragment>
       setters
         set m= @-1
           reference: <testLibraryFragment>::@setter::m
-          enclosingFragment: <testLibraryFragment>
           parameters
             _m @-1
   topLevelVariables
     m
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<dynamic, int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::m
       getter: <none>
@@ -3848,12 +3623,10 @@
   getters
     synthetic static get m
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::m
   setters
     synthetic static set m=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _m
           reference: <none>
@@ -3896,23 +3669,19 @@
       topLevelVariables
         m @21
           reference: <testLibraryFragment>::@topLevelVariable::m
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::m
           setter2: <testLibraryFragment>::@setter::m
       getters
         get m @-1
           reference: <testLibraryFragment>::@getter::m
-          enclosingFragment: <testLibraryFragment>
       setters
         set m= @-1
           reference: <testLibraryFragment>::@setter::m
-          enclosingFragment: <testLibraryFragment>
           parameters
             _m @-1
   topLevelVariables
     m
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<String, dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::m
       getter: <none>
@@ -3920,12 +3689,10 @@
   getters
     synthetic static get m
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::m
   setters
     synthetic static set m=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _m
           reference: <none>
@@ -3968,23 +3735,19 @@
       topLevelVariables
         m @17
           reference: <testLibraryFragment>::@topLevelVariable::m
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::m
           setter2: <testLibraryFragment>::@setter::m
       getters
         get m @-1
           reference: <testLibraryFragment>::@getter::m
-          enclosingFragment: <testLibraryFragment>
       setters
         set m= @-1
           reference: <testLibraryFragment>::@setter::m
-          enclosingFragment: <testLibraryFragment>
           parameters
             _m @-1
   topLevelVariables
     m
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<String, int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::m
       getter: <none>
@@ -3992,12 +3755,10 @@
   getters
     synthetic static get m
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::m
   setters
     synthetic static set m=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _m
           reference: <none>
@@ -4040,23 +3801,19 @@
       topLevelVariables
         m @4
           reference: <testLibraryFragment>::@topLevelVariable::m
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::m
           setter2: <testLibraryFragment>::@setter::m
       getters
         get m @-1
           reference: <testLibraryFragment>::@getter::m
-          enclosingFragment: <testLibraryFragment>
       setters
         set m= @-1
           reference: <testLibraryFragment>::@setter::m
-          enclosingFragment: <testLibraryFragment>
           parameters
             _m @-1
   topLevelVariables
     m
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<dynamic, dynamic>
       firstFragment: <testLibraryFragment>::@topLevelVariable::m
       getter: <none>
@@ -4064,12 +3821,10 @@
   getters
     synthetic static get m
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::m
   setters
     synthetic static set m=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _m
           reference: <none>
@@ -4112,23 +3867,19 @@
       topLevelVariables
         d @8
           reference: <testLibraryFragment>::@topLevelVariable::d
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::d
           setter2: <testLibraryFragment>::@setter::d
       getters
         get d @-1
           reference: <testLibraryFragment>::@getter::d
-          enclosingFragment: <testLibraryFragment>
       setters
         set d= @-1
           reference: <testLibraryFragment>::@setter::d
-          enclosingFragment: <testLibraryFragment>
           parameters
             _d @-1
   topLevelVariables
     d
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::d
       getter: <none>
@@ -4136,12 +3887,10 @@
   getters
     synthetic static get d
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::d
   setters
     synthetic static set d=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _d
           reference: <none>
@@ -4184,23 +3933,19 @@
       topLevelVariables
         c @2
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -4208,12 +3953,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -4279,23 +4022,19 @@
       topLevelVariables
         c @35
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -4303,12 +4042,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
diff --git a/pkg/analyzer/test/src/summary/macro_test.dart b/pkg/analyzer/test/src/summary/macro_test.dart
index a97713b..7bf75db 100644
--- a/pkg/analyzer/test/src/summary/macro_test.dart
+++ b/pkg/analyzer/test/src/summary/macro_test.dart
@@ -211,15 +211,12 @@
   classes
     class A1
       reference: <testLibraryFragment>::@class::A1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A1
     class A2
       reference: <testLibraryFragment>::@class::A2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A2
     class A3
       reference: <testLibraryFragment>::@class::A3
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A3
 ''');
   }
@@ -393,15 +390,12 @@
   classes
     class A1
       reference: <testLibraryFragment>::@class::A1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A1
     class A2
       reference: <testLibraryFragment>::@class::A2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A2
     class A3
       reference: <testLibraryFragment>::@class::A3
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A3
 ''');
   }
@@ -574,15 +568,12 @@
   classes
     class A1
       reference: <testLibraryFragment>::@class::A1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A1
     class A2
       reference: <testLibraryFragment>::@class::A2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A2
     class A3
       reference: <testLibraryFragment>::@class::A3
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A3
 ''');
   }
@@ -685,15 +676,12 @@
   classes
     class A1
       reference: <testLibraryFragment>::@class::A1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A1
     class A2
       reference: <testLibraryFragment>::@class::A2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A2
     class A3
       reference: <testLibraryFragment>::@class::A3
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A3
 ''');
   }
@@ -1063,7 +1051,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''',
     );
@@ -3143,12 +3130,10 @@
           fields
             f @82
               reference: <testLibraryFragment>::@class::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::f
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/test.macro.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -3158,18 +3143,15 @@
           constructors
             named @57
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               periodOffset: 56
               nameEnd: 62
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::f
           getter: <none>
@@ -3184,7 +3166,6 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::f
 ''');
   }
@@ -3275,13 +3256,11 @@
           constructors
             named @57
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               periodOffset: 56
               nameEnd: 62
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         named
@@ -3378,11 +3357,9 @@
           constructors
             new @55
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -3495,28 +3472,23 @@
           fields
             foo @59
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
               setter2: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
           setters
             set foo= @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               parameters
                 _foo @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
           getter: <none>
@@ -3524,12 +3496,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -3629,28 +3599,23 @@
           fields
             foo @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
           getters
             get foo @63
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
 ''');
   }
@@ -3742,13 +3707,11 @@
           methods
             foo @59
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               parameters
                 a @70
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -3855,30 +3818,25 @@
           fields
             foo @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               setter2: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setter::foo
           setters
             set foo= @59
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               parameters
                 a @67
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
           setter: <none>
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional a
               reference: <none>
@@ -3921,7 +3879,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         new
@@ -3966,7 +3923,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       methods
         foo
@@ -4011,7 +3967,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       methods
         foo
@@ -4072,7 +4027,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       methods
         foo
@@ -4133,19 +4087,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: dynamic
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@field::foo
           setter: <none>
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional x
               reference: <none>
@@ -4202,19 +4153,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         static const x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@field::x
           getter: <none>
       getters
         synthetic static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@getter::x
 ''');
   }
@@ -4253,19 +4201,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@field::x
           getter: <none>
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@getter::x
 ''');
   }
@@ -4302,19 +4247,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         final x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@field::x
           getter: <none>
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@getter::x
 ''');
   }
@@ -4351,19 +4293,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         static const x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: Type
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@field::x
           getter: <none>
       getters
         synthetic static get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@getter::x
 ''');
   }
@@ -4400,19 +4339,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::x
 ''');
   }
@@ -4450,19 +4386,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::x
 ''');
   }
@@ -4506,29 +4439,24 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::x
       getter: <none>
     const y
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::y
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::x
     synthetic static get y
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::y
 ''');
   }
@@ -4565,19 +4493,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
   topLevelVariables
     const x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: InvalidType
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::x
 ''');
   }
@@ -4618,11 +4543,9 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
     class C
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::C
 ''');
   }
@@ -4665,7 +4588,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         named
@@ -4729,19 +4651,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@field::foo
           getter: <none>
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@getter::foo
 ''');
   }
@@ -4782,29 +4701,24 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@field::foo
           getter: <none>
         final bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@field::bar
           getter: <none>
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@getter::foo
         synthetic get bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@getter::bar
 ''');
   }
@@ -4845,19 +4759,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@field::foo
           getter: <none>
       getters
         get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           metadata
             Annotation
               atSign: @ @97
@@ -4917,7 +4828,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       methods
         foo
@@ -4981,19 +4891,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::B::@field::foo
           setter: <none>
       setters
         set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           metadata
             Annotation
               atSign: @ @97
@@ -5057,7 +4964,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
 ''');
   }
@@ -5094,7 +5000,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
 ''');
   }
@@ -5135,19 +5040,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::foo
       getter: <none>
   getters
     static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       metadata
         Annotation
           atSign: @ @77
@@ -5207,19 +5109,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::foo
       setter: <none>
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       metadata
         Annotation
           atSign: @ @77
@@ -5279,19 +5178,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
   topLevelVariables
     synthetic foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::foo
       setter: <none>
   setters
     static set foo=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional x
           reference: <none>
@@ -5352,19 +5248,16 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
   topLevelVariables
     final foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::foo
 ''');
   }
@@ -5405,29 +5298,24 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
   topLevelVariables
     final foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::foo
       getter: <none>
     final bar
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::bar
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::foo
     synthetic static get bar
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::bar
 ''');
   }
@@ -5470,11 +5358,9 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
     class C
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::C
 ''');
   }
@@ -5517,11 +5403,9 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
     class C
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::C
 ''');
   }
@@ -5564,11 +5448,9 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
     class C
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::C
 ''');
   }
@@ -5613,7 +5495,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -5652,11 +5533,9 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
 ''');
   }
@@ -5757,7 +5636,6 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
 ''');
   }
@@ -5838,7 +5716,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
   exportedReferences
     declared <testLibraryFragment>::@class::A
@@ -5935,28 +5812,23 @@
       topLevelVariables
         final x @41
           reference: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart
           getter2: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::x
       getters
         get x @-1
           reference: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::x
-          enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
   topLevelVariables
     final x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@accessor::x
   exportedReferences
     declared <testLibraryFragment>::@class::A
@@ -6094,20 +5966,17 @@
           constructors
             named @131
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructor::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               periodOffset: 130
               nameEnd: 136
               nextFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructorAugmentation::named
             augment named @152
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructorAugmentation::named
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               periodOffset: 151
               nameEnd: 157
               previousFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructor::named
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         named
@@ -6265,33 +6134,27 @@
           fields
             foo @166
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               nextFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@fieldAugmentation::foo
               getter2: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
               setter2: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setter::foo
             foo @193
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@fieldAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
           getters
             get foo @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
           setters
             set foo= @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               parameters
                 _foo @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
           getter: <none>
@@ -6299,12 +6162,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -6451,33 +6312,27 @@
           fields
             foo @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               getter2: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
           getters
             get foo @180
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               nextFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getterAugmentation::foo
             augment get foo @211
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               previousFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
           getter: <none>
       getters
         external get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@getter::foo
 ''');
   }
@@ -6607,15 +6462,12 @@
             foo @176
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
             augment foo @205
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -6768,37 +6620,31 @@
           fields
             foo @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               setter2: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setter::foo
           setters
             set foo= @173
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setter::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               parameters
                 value @189
               nextFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setterAugmentation::foo
             augment set foo= @216
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setterAugmentation::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               parameters
                 value @232
               previousFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@setter::foo
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@field::foo
           setter: <none>
       setters
         external set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional value
               reference: <none>
@@ -6985,7 +6831,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -7041,11 +6886,9 @@
           methods
             foo @93
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -7098,7 +6941,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -7177,11 +7019,9 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class B
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::B
 ''');
   }
@@ -7264,7 +7104,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -7445,7 +7284,6 @@
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
 ''');
   }
@@ -7519,7 +7357,6 @@
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
 ''');
   }
@@ -7580,7 +7417,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -7652,13 +7488,11 @@
           methods
             foo @97
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               typeParameters
                 T @101
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -7737,7 +7571,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
         U
@@ -7806,7 +7639,6 @@
           constructors
             new @70
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               macroDiagnostics
                 MacroDiagnostic
                   message: MacroDiagnosticMessage
@@ -7818,7 +7650,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -7896,28 +7727,23 @@
           fields
             foo @80
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -8043,11 +7869,9 @@
           methods
             foo @75
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -8114,7 +7938,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::A
       superclassConstraints
         Object
@@ -8185,7 +8008,6 @@
   mixins
     mixin A
       reference: <testLibraryFragment>::@mixin::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@mixin::A
@@ -8313,11 +8135,9 @@
           methods
             foo @67
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -8385,7 +8205,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -8462,28 +8281,23 @@
           fields
             foo @102
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -8985,28 +8799,23 @@
           fields
             foo @98
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -9196,11 +9005,9 @@
           methods
             foo @90
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -9272,23 +9079,19 @@
       topLevelVariables
         final foo @80
           reference: <testLibraryFragment>::@topLevelVariable::foo
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::foo
       getters
         get foo @-1
           reference: <testLibraryFragment>::@getter::foo
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final foo
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::foo
       getter: <none>
   getters
     synthetic static get foo
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::foo
 ''');
   }
@@ -9487,14 +9290,12 @@
           methods
             foo @116
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @124
                 b @134
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -9576,11 +9377,9 @@
           methods
             foo @94
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -9724,28 +9523,23 @@
           fields
             foo @145
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: (bool, {int a, String b})?
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -9825,28 +9619,23 @@
           fields
             foo @138
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: (int, String)?
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
 ''');
   }
@@ -9984,14 +9773,11 @@
           methods
             foo @73
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
             bar @89
               reference: <testLibraryFragment>::@class::A::@method::bar
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -10058,7 +9844,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -10118,7 +9903,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -10178,7 +9962,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -10246,7 +10029,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -10318,7 +10100,6 @@
           constructors
             new @76
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               macroDiagnostics
                 MacroDiagnostic
                   message: MacroDiagnosticMessage
@@ -10337,7 +10118,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         new
@@ -10429,28 +10209,23 @@
           fields
             foo @80
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
               setter2: <testLibraryFragment>::@class::A::@setter::foo
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set foo= @-1
               reference: <testLibraryFragment>::@class::A::@setter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _foo @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
@@ -10458,12 +10233,10 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
       setters
         synthetic set foo=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _foo
               reference: <none>
@@ -10542,11 +10315,9 @@
           methods
             foo @81
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -10618,7 +10389,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -10683,7 +10453,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -10746,7 +10515,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -10814,7 +10582,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
 ''');
   }
@@ -10849,11 +10616,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -10909,7 +10674,6 @@
           constructors
             synthetic const new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
               constantInitializers
                 SuperConstructorInvocation
                   superKeyword: super @0
@@ -10923,7 +10687,6 @@
   classes
     class alias A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       supertype: Object
       constructors
@@ -10933,7 +10696,6 @@
   mixins
     mixin M
       reference: <testLibraryFragment>::@mixin::M
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@mixin::M
       superclassConstraints
         Object
@@ -11050,16 +10812,13 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
     class C
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::C
 ''');
   }
@@ -11129,11 +10888,9 @@
           methods
             foo @74
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -11251,11 +11008,9 @@
           methods
             foo @74
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -11337,7 +11092,6 @@
           methods
             foo @85
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/test.macro.dart
       previousFragment: <testLibraryFragment>
       extensions
@@ -11346,7 +11100,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -11355,7 +11108,6 @@
   extensions
     extension B
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@extension::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@extension::B
 ''');
   }
@@ -11420,11 +11172,9 @@
           methods
             foo @91
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -11493,11 +11243,9 @@
           methods
             foo @74
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -11566,11 +11314,9 @@
           methods
             foo @80
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -11641,11 +11387,9 @@
           methods
             foo @78
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -11716,11 +11460,9 @@
           methods
             foo @77
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -11791,11 +11533,9 @@
           methods
             foo @79
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -11866,11 +11606,9 @@
           methods
             foo @80
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -11941,11 +11679,9 @@
           methods
             foo @78
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -12043,30 +11779,24 @@
           methods
             foo @87
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
       enums
         enum B @104
           reference: <testLibraryFragment>::@enum::B
           fields
             enumConstant v @107
               reference: <testLibraryFragment>::@enum::B::@field::v
-              enclosingFragment: <testLibraryFragment>::@enum::B
               getter2: <testLibraryFragment>::@enum::B::@getter::v
             values @-1
               reference: <testLibraryFragment>::@enum::B::@field::values
-              enclosingFragment: <testLibraryFragment>::@enum::B
               getter2: <testLibraryFragment>::@enum::B::@getter::values
           getters
             get v @-1
               reference: <testLibraryFragment>::@enum::B::@getter::v
-              enclosingFragment: <testLibraryFragment>::@enum::B
             get values @-1
               reference: <testLibraryFragment>::@enum::B::@getter::values
-              enclosingFragment: <testLibraryFragment>::@enum::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -12075,30 +11805,25 @@
   enums
     enum B
       reference: <testLibraryFragment>::@enum::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@enum::B
       supertype: Enum
       fields
         static const v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           type: B
           firstFragment: <testLibraryFragment>::@enum::B::@field::v
           getter: <none>
         synthetic static const values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           type: List<B>
           firstFragment: <testLibraryFragment>::@enum::B::@field::values
           getter: <none>
       getters
         synthetic static get v
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           firstFragment: <testLibraryFragment>::@enum::B::@getter::v
         synthetic static get values
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@enum::B
           firstFragment: <testLibraryFragment>::@enum::B::@getter::values
 ''');
   }
@@ -12165,11 +11890,9 @@
           methods
             foo @89
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -12240,11 +11963,9 @@
           methods
             foo @95
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -12341,7 +12062,6 @@
             foo @82
               reference: <testLibraryFragment>::@class::A::@method::foo
               nextFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/test.macro.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -12352,11 +12072,9 @@
             augment foo @68
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@methodAugmentation::foo
               previousFragment: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -12427,11 +12145,9 @@
           methods
             foo @81
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -12502,11 +12218,9 @@
           methods
             foo @78
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -12577,11 +12291,9 @@
           methods
             foo @80
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -12652,11 +12364,9 @@
           methods
             foo @84
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       methods
         foo
@@ -12817,19 +12527,15 @@
           fields
             foo @69
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
             bar @86
               reference: <testLibraryFragment>::@class::A::@field::bar
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::bar
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
             get bar @-1
               reference: <testLibraryFragment>::@class::A::@getter::bar
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/test.macro.dart
       previousFragment: <testLibraryFragment>
       libraryImports
@@ -12845,37 +12551,30 @@
             toString @122
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@method::toString
               nextFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@methodAugmentation::toString
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
             augment toString @159
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@methodAugmentation::toString
               previousFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@method::toString
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
         final bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::bar
           getter: <none>
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
         synthetic get bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::bar
       methods
         toString
@@ -13048,19 +12747,15 @@
           fields
             foo @76
               reference: <testLibraryFragment>::@class::A::@field::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::foo
             bar @93
               reference: <testLibraryFragment>::@class::A::@field::bar
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::bar
           getters
             get foo @-1
               reference: <testLibraryFragment>::@class::A::@getter::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
             get bar @-1
               reference: <testLibraryFragment>::@class::A::@getter::bar
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/test.macro.dart
       previousFragment: <testLibraryFragment>
       libraryImports
@@ -13078,13 +12773,11 @@
           constructors
             external fromJson @177
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructor::fromJson
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               periodOffset: 176
               nameEnd: 185
               nextFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructorAugmentation::fromJson
             augment fromJson @336
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructorAugmentation::fromJson
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
               periodOffset: 335
               nameEnd: 344
               previousFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@constructor::fromJson
@@ -13092,26 +12785,21 @@
             toJson @314
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@method::toJson
               nextFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@methodAugmentation::toJson
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
             augment toJson @547
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@methodAugmentation::toJson
               previousFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A::@method::toJson
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@classAugmentation::A
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         final foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::foo
           getter: <none>
         final bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::bar
           getter: <none>
@@ -13126,11 +12814,9 @@
       getters
         synthetic get foo
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::foo
         synthetic get bar
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::bar
       methods
         toJson
@@ -18039,11 +17725,9 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class MyClass
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
 ''');
   }
@@ -18119,7 +17803,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/test.macro.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -18128,11 +17811,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -18140,7 +17821,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class MyClass
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
       constructors
         synthetic new
@@ -18233,7 +17913,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/test.macro.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -18242,11 +17921,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -18254,7 +17931,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class MyClass
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
       constructors
         synthetic new
@@ -18347,7 +18023,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
     <testLibrary>::@fragment::package:test/test.macro.dart
       previousFragment: <testLibraryFragment>
       classes
@@ -18356,11 +18031,9 @@
           constructors
             synthetic new @-1
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass::@constructor::new
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -18368,7 +18041,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
     class MyClass
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
       constructors
         synthetic new
@@ -18455,11 +18127,9 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class B
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::B
   exportedReferences
     declared <testLibraryFragment>::@class::A
@@ -18687,11 +18357,9 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
     class MyClass
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
 ''');
     }
@@ -18824,17 +18492,14 @@
           methods
             foo @100
               reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass::@method::foo
-              enclosingFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
               parameters
                 _ @114
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
     class MyClass
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::MyClass
       methods
         foo
@@ -19268,15 +18933,12 @@
   classes
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
     class A
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::A
     class B
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::B
 ''');
 
@@ -19526,11 +19188,9 @@
   classes
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
     class X
       reference: <testLibrary>::@fragment::package:test/test.macro.dart::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibrary>::@fragment::package:test/test.macro.dart::@class::X
 ''');
   }
@@ -20265,11 +19925,9 @@
   classes
     class A
       reference: package:other/other.dart::<fragment>::@class::A
-      enclosingElement2: package:other/other.dart
       firstFragment: package:other/other.dart::<fragment>::@class::A
     class B
       reference: package:other/other.dart::@fragment::package:other/other.macro.dart::@class::B
-      enclosingElement2: package:other/other.dart
       firstFragment: package:other/other.dart::@fragment::package:other/other.macro.dart::@class::B
 ''');
   }
diff --git a/pkg/analyzer/test/src/summary/top_level_inference_test.dart b/pkg/analyzer/test/src/summary/top_level_inference_test.dart
index 50f644e..1f2d0fe 100644
--- a/pkg/analyzer/test/src/summary/top_level_inference_test.dart
+++ b/pkg/analyzer/test/src/summary/top_level_inference_test.dart
@@ -508,163 +508,131 @@
       topLevelVariables
         vPlusIntInt @4
           reference: <testLibraryFragment>::@topLevelVariable::vPlusIntInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vPlusIntInt
           setter2: <testLibraryFragment>::@setter::vPlusIntInt
         vPlusIntDouble @29
           reference: <testLibraryFragment>::@topLevelVariable::vPlusIntDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vPlusIntDouble
           setter2: <testLibraryFragment>::@setter::vPlusIntDouble
         vPlusDoubleInt @59
           reference: <testLibraryFragment>::@topLevelVariable::vPlusDoubleInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vPlusDoubleInt
           setter2: <testLibraryFragment>::@setter::vPlusDoubleInt
         vPlusDoubleDouble @89
           reference: <testLibraryFragment>::@topLevelVariable::vPlusDoubleDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vPlusDoubleDouble
           setter2: <testLibraryFragment>::@setter::vPlusDoubleDouble
         vMinusIntInt @124
           reference: <testLibraryFragment>::@topLevelVariable::vMinusIntInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vMinusIntInt
           setter2: <testLibraryFragment>::@setter::vMinusIntInt
         vMinusIntDouble @150
           reference: <testLibraryFragment>::@topLevelVariable::vMinusIntDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vMinusIntDouble
           setter2: <testLibraryFragment>::@setter::vMinusIntDouble
         vMinusDoubleInt @181
           reference: <testLibraryFragment>::@topLevelVariable::vMinusDoubleInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vMinusDoubleInt
           setter2: <testLibraryFragment>::@setter::vMinusDoubleInt
         vMinusDoubleDouble @212
           reference: <testLibraryFragment>::@topLevelVariable::vMinusDoubleDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vMinusDoubleDouble
           setter2: <testLibraryFragment>::@setter::vMinusDoubleDouble
       getters
         get vPlusIntInt @-1
           reference: <testLibraryFragment>::@getter::vPlusIntInt
-          enclosingFragment: <testLibraryFragment>
         get vPlusIntDouble @-1
           reference: <testLibraryFragment>::@getter::vPlusIntDouble
-          enclosingFragment: <testLibraryFragment>
         get vPlusDoubleInt @-1
           reference: <testLibraryFragment>::@getter::vPlusDoubleInt
-          enclosingFragment: <testLibraryFragment>
         get vPlusDoubleDouble @-1
           reference: <testLibraryFragment>::@getter::vPlusDoubleDouble
-          enclosingFragment: <testLibraryFragment>
         get vMinusIntInt @-1
           reference: <testLibraryFragment>::@getter::vMinusIntInt
-          enclosingFragment: <testLibraryFragment>
         get vMinusIntDouble @-1
           reference: <testLibraryFragment>::@getter::vMinusIntDouble
-          enclosingFragment: <testLibraryFragment>
         get vMinusDoubleInt @-1
           reference: <testLibraryFragment>::@getter::vMinusDoubleInt
-          enclosingFragment: <testLibraryFragment>
         get vMinusDoubleDouble @-1
           reference: <testLibraryFragment>::@getter::vMinusDoubleDouble
-          enclosingFragment: <testLibraryFragment>
       setters
         set vPlusIntInt= @-1
           reference: <testLibraryFragment>::@setter::vPlusIntInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vPlusIntInt @-1
         set vPlusIntDouble= @-1
           reference: <testLibraryFragment>::@setter::vPlusIntDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vPlusIntDouble @-1
         set vPlusDoubleInt= @-1
           reference: <testLibraryFragment>::@setter::vPlusDoubleInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vPlusDoubleInt @-1
         set vPlusDoubleDouble= @-1
           reference: <testLibraryFragment>::@setter::vPlusDoubleDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vPlusDoubleDouble @-1
         set vMinusIntInt= @-1
           reference: <testLibraryFragment>::@setter::vMinusIntInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vMinusIntInt @-1
         set vMinusIntDouble= @-1
           reference: <testLibraryFragment>::@setter::vMinusIntDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vMinusIntDouble @-1
         set vMinusDoubleInt= @-1
           reference: <testLibraryFragment>::@setter::vMinusDoubleInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vMinusDoubleInt @-1
         set vMinusDoubleDouble= @-1
           reference: <testLibraryFragment>::@setter::vMinusDoubleDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vMinusDoubleDouble @-1
   topLevelVariables
     vPlusIntInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vPlusIntInt
       getter: <none>
       setter: <none>
     vPlusIntDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vPlusIntDouble
       getter: <none>
       setter: <none>
     vPlusDoubleInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vPlusDoubleInt
       getter: <none>
       setter: <none>
     vPlusDoubleDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vPlusDoubleDouble
       getter: <none>
       setter: <none>
     vMinusIntInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vMinusIntInt
       getter: <none>
       setter: <none>
     vMinusIntDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vMinusIntDouble
       getter: <none>
       setter: <none>
     vMinusDoubleInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vMinusDoubleInt
       getter: <none>
       setter: <none>
     vMinusDoubleDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vMinusDoubleDouble
       getter: <none>
@@ -672,40 +640,31 @@
   getters
     synthetic static get vPlusIntInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vPlusIntInt
     synthetic static get vPlusIntDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vPlusIntDouble
     synthetic static get vPlusDoubleInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vPlusDoubleInt
     synthetic static get vPlusDoubleDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vPlusDoubleDouble
     synthetic static get vMinusIntInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vMinusIntInt
     synthetic static get vMinusIntDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vMinusIntDouble
     synthetic static get vMinusDoubleInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vMinusDoubleInt
     synthetic static get vMinusDoubleDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vMinusDoubleDouble
   setters
     synthetic static set vPlusIntInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vPlusIntInt
           reference: <none>
@@ -713,7 +672,6 @@
       firstFragment: <testLibraryFragment>::@setter::vPlusIntInt
     synthetic static set vPlusIntDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vPlusIntDouble
           reference: <none>
@@ -721,7 +679,6 @@
       firstFragment: <testLibraryFragment>::@setter::vPlusIntDouble
     synthetic static set vPlusDoubleInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vPlusDoubleInt
           reference: <none>
@@ -729,7 +686,6 @@
       firstFragment: <testLibraryFragment>::@setter::vPlusDoubleInt
     synthetic static set vPlusDoubleDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vPlusDoubleDouble
           reference: <none>
@@ -737,7 +693,6 @@
       firstFragment: <testLibraryFragment>::@setter::vPlusDoubleDouble
     synthetic static set vMinusIntInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vMinusIntInt
           reference: <none>
@@ -745,7 +700,6 @@
       firstFragment: <testLibraryFragment>::@setter::vMinusIntInt
     synthetic static set vMinusIntDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vMinusIntDouble
           reference: <none>
@@ -753,7 +707,6 @@
       firstFragment: <testLibraryFragment>::@setter::vMinusIntDouble
     synthetic static set vMinusDoubleInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vMinusDoubleInt
           reference: <none>
@@ -761,7 +714,6 @@
       firstFragment: <testLibraryFragment>::@setter::vMinusDoubleInt
     synthetic static set vMinusDoubleDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vMinusDoubleDouble
           reference: <none>
@@ -807,23 +759,19 @@
       topLevelVariables
         V @4
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
           setter2: <testLibraryFragment>::@setter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
       setters
         set V= @-1
           reference: <testLibraryFragment>::@setter::V
-          enclosingFragment: <testLibraryFragment>
           parameters
             _V @-1
   topLevelVariables
     V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: num
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
@@ -831,12 +779,10 @@
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
   setters
     synthetic static set V=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _V
           reference: <none>
@@ -916,63 +862,51 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         t1 @15
           reference: <testLibraryFragment>::@topLevelVariable::t1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::t1
           setter2: <testLibraryFragment>::@setter::t1
         t2 @33
           reference: <testLibraryFragment>::@topLevelVariable::t2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::t2
           setter2: <testLibraryFragment>::@setter::t2
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get t1 @-1
           reference: <testLibraryFragment>::@getter::t1
-          enclosingFragment: <testLibraryFragment>
         get t2 @-1
           reference: <testLibraryFragment>::@getter::t2
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set t1= @-1
           reference: <testLibraryFragment>::@setter::t1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _t1 @-1
         set t2= @-1
           reference: <testLibraryFragment>::@setter::t2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _t2 @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     t1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::t1
       getter: <none>
       setter: <none>
     t2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::t2
       getter: <none>
@@ -980,20 +914,16 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get t1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::t1
     synthetic static get t2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::t2
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -1001,7 +931,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set t1=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _t1
           reference: <none>
@@ -1009,7 +938,6 @@
       firstFragment: <testLibraryFragment>::@setter::t1
     synthetic static set t2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _t2
           reference: <none>
@@ -1089,63 +1017,51 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         t1 @17
           reference: <testLibraryFragment>::@topLevelVariable::t1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::t1
           setter2: <testLibraryFragment>::@setter::t1
         t2 @38
           reference: <testLibraryFragment>::@topLevelVariable::t2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::t2
           setter2: <testLibraryFragment>::@setter::t2
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get t1 @-1
           reference: <testLibraryFragment>::@getter::t1
-          enclosingFragment: <testLibraryFragment>
         get t2 @-1
           reference: <testLibraryFragment>::@getter::t2
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set t1= @-1
           reference: <testLibraryFragment>::@setter::t1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _t1 @-1
         set t2= @-1
           reference: <testLibraryFragment>::@setter::t2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _t2 @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     t1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::t1
       getter: <none>
       setter: <none>
     t2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::t2
       getter: <none>
@@ -1153,20 +1069,16 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get t1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::t1
     synthetic static get t2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::t2
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -1174,7 +1086,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set t1=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _t1
           reference: <none>
@@ -1182,7 +1093,6 @@
       firstFragment: <testLibraryFragment>::@setter::t1
     synthetic static set t2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _t2
           reference: <none>
@@ -1293,74 +1203,59 @@
           fields
             f @16
               reference: <testLibraryFragment>::@class::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::f
               setter2: <testLibraryFragment>::@class::A::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::A::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _f @-1
       topLevelVariables
         a @25
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         t1 @42
           reference: <testLibraryFragment>::@topLevelVariable::t1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::t1
           setter2: <testLibraryFragment>::@setter::t1
         t2 @62
           reference: <testLibraryFragment>::@topLevelVariable::t2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::t2
           setter2: <testLibraryFragment>::@setter::t2
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get t1 @-1
           reference: <testLibraryFragment>::@getter::t1
-          enclosingFragment: <testLibraryFragment>
         get t2 @-1
           reference: <testLibraryFragment>::@getter::t2
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set t1= @-1
           reference: <testLibraryFragment>::@setter::t1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _t1 @-1
         set t2= @-1
           reference: <testLibraryFragment>::@setter::t2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _t2 @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::f
           getter: <none>
@@ -1372,12 +1267,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _f
               reference: <none>
@@ -1386,21 +1279,18 @@
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     t1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::t1
       getter: <none>
       setter: <none>
     t2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::t2
       getter: <none>
@@ -1408,20 +1298,16 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get t1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::t1
     synthetic static get t2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::t2
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -1429,7 +1315,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set t1=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _t1
           reference: <none>
@@ -1437,7 +1322,6 @@
       firstFragment: <testLibraryFragment>::@setter::t1
     synthetic static set t2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _t2
           reference: <none>
@@ -1557,21 +1441,17 @@
           fields
             f @16
               reference: <testLibraryFragment>::@class::I::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::I
               getter2: <testLibraryFragment>::@class::I::@getter::f
               setter2: <testLibraryFragment>::@class::I::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::I::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::I
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::I::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::I
               parameters
                 _f @-1
         class C @36
@@ -1579,58 +1459,46 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @56
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         t1 @63
           reference: <testLibraryFragment>::@topLevelVariable::t1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::t1
           setter2: <testLibraryFragment>::@setter::t1
         t2 @83
           reference: <testLibraryFragment>::@topLevelVariable::t2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::t2
           setter2: <testLibraryFragment>::@setter::t2
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get t1 @-1
           reference: <testLibraryFragment>::@getter::t1
-          enclosingFragment: <testLibraryFragment>
         get t2 @-1
           reference: <testLibraryFragment>::@getter::t2
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set t1= @-1
           reference: <testLibraryFragment>::@setter::t1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _t1 @-1
         set t2= @-1
           reference: <testLibraryFragment>::@setter::t2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _t2 @-1
   classes
     class I
       reference: <testLibraryFragment>::@class::I
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           type: int
           firstFragment: <testLibraryFragment>::@class::I::@field::f
           getter: <none>
@@ -1642,12 +1510,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           firstFragment: <testLibraryFragment>::@class::I::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           parameters
             requiredPositional _f
               reference: <none>
@@ -1655,7 +1521,6 @@
           firstFragment: <testLibraryFragment>::@class::I::@setter::f
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1664,21 +1529,18 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     t1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::t1
       getter: <none>
       setter: <none>
     t2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::t2
       getter: <none>
@@ -1686,20 +1548,16 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get t1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::t1
     synthetic static get t2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::t2
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -1707,7 +1565,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set t1=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _t1
           reference: <none>
@@ -1715,7 +1572,6 @@
       firstFragment: <testLibraryFragment>::@setter::t1
     synthetic static set t2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _t2
           reference: <none>
@@ -1825,21 +1681,17 @@
           fields
             f @16
               reference: <testLibraryFragment>::@class::I::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::I
               getter2: <testLibraryFragment>::@class::I::@getter::f
               setter2: <testLibraryFragment>::@class::I::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::I::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::I
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::I::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::I
               parameters
                 _f @-1
         class C @36
@@ -1847,45 +1699,36 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         t1 @76
           reference: <testLibraryFragment>::@topLevelVariable::t1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::t1
           setter2: <testLibraryFragment>::@setter::t1
         t2 @101
           reference: <testLibraryFragment>::@topLevelVariable::t2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::t2
           setter2: <testLibraryFragment>::@setter::t2
       getters
         get t1 @-1
           reference: <testLibraryFragment>::@getter::t1
-          enclosingFragment: <testLibraryFragment>
         get t2 @-1
           reference: <testLibraryFragment>::@getter::t2
-          enclosingFragment: <testLibraryFragment>
       setters
         set t1= @-1
           reference: <testLibraryFragment>::@setter::t1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _t1 @-1
         set t2= @-1
           reference: <testLibraryFragment>::@setter::t2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _t2 @-1
   classes
     class I
       reference: <testLibraryFragment>::@class::I
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           type: int
           firstFragment: <testLibraryFragment>::@class::I::@field::f
           getter: <none>
@@ -1897,12 +1740,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           firstFragment: <testLibraryFragment>::@class::I::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           parameters
             requiredPositional _f
               reference: <none>
@@ -1910,7 +1751,6 @@
           firstFragment: <testLibraryFragment>::@class::I::@setter::f
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -1919,14 +1759,12 @@
   topLevelVariables
     t1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::t1
       getter: <none>
       setter: <none>
     t2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::t2
       getter: <none>
@@ -1934,16 +1772,13 @@
   getters
     synthetic static get t1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::t1
     synthetic static get t2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::t2
   setters
     synthetic static set t1=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _t1
           reference: <none>
@@ -1951,7 +1786,6 @@
       firstFragment: <testLibraryFragment>::@setter::t1
     synthetic static set t2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _t2
           reference: <none>
@@ -2036,43 +1870,35 @@
       topLevelVariables
         uValue @80
           reference: <testLibraryFragment>::@topLevelVariable::uValue
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::uValue
           setter2: <testLibraryFragment>::@setter::uValue
         uFuture @121
           reference: <testLibraryFragment>::@topLevelVariable::uFuture
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::uFuture
           setter2: <testLibraryFragment>::@setter::uFuture
       getters
         get uValue @-1
           reference: <testLibraryFragment>::@getter::uValue
-          enclosingFragment: <testLibraryFragment>
         get uFuture @-1
           reference: <testLibraryFragment>::@getter::uFuture
-          enclosingFragment: <testLibraryFragment>
       setters
         set uValue= @-1
           reference: <testLibraryFragment>::@setter::uValue
-          enclosingFragment: <testLibraryFragment>
           parameters
             _uValue @-1
         set uFuture= @-1
           reference: <testLibraryFragment>::@setter::uFuture
-          enclosingFragment: <testLibraryFragment>
           parameters
             _uFuture @-1
   topLevelVariables
     uValue
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<int> Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::uValue
       getter: <none>
       setter: <none>
     uFuture
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<int> Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::uFuture
       getter: <none>
@@ -2080,16 +1906,13 @@
   getters
     synthetic static get uValue
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::uValue
     synthetic static get uFuture
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::uFuture
   setters
     synthetic static set uValue=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _uValue
           reference: <none>
@@ -2097,7 +1920,6 @@
       firstFragment: <testLibraryFragment>::@setter::uValue
     synthetic static set uFuture=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _uFuture
           reference: <none>
@@ -2211,103 +2033,83 @@
       topLevelVariables
         vBitXor @4
           reference: <testLibraryFragment>::@topLevelVariable::vBitXor
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBitXor
           setter2: <testLibraryFragment>::@setter::vBitXor
         vBitAnd @25
           reference: <testLibraryFragment>::@topLevelVariable::vBitAnd
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBitAnd
           setter2: <testLibraryFragment>::@setter::vBitAnd
         vBitOr @46
           reference: <testLibraryFragment>::@topLevelVariable::vBitOr
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBitOr
           setter2: <testLibraryFragment>::@setter::vBitOr
         vBitShiftLeft @66
           reference: <testLibraryFragment>::@topLevelVariable::vBitShiftLeft
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBitShiftLeft
           setter2: <testLibraryFragment>::@setter::vBitShiftLeft
         vBitShiftRight @94
           reference: <testLibraryFragment>::@topLevelVariable::vBitShiftRight
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBitShiftRight
           setter2: <testLibraryFragment>::@setter::vBitShiftRight
       getters
         get vBitXor @-1
           reference: <testLibraryFragment>::@getter::vBitXor
-          enclosingFragment: <testLibraryFragment>
         get vBitAnd @-1
           reference: <testLibraryFragment>::@getter::vBitAnd
-          enclosingFragment: <testLibraryFragment>
         get vBitOr @-1
           reference: <testLibraryFragment>::@getter::vBitOr
-          enclosingFragment: <testLibraryFragment>
         get vBitShiftLeft @-1
           reference: <testLibraryFragment>::@getter::vBitShiftLeft
-          enclosingFragment: <testLibraryFragment>
         get vBitShiftRight @-1
           reference: <testLibraryFragment>::@getter::vBitShiftRight
-          enclosingFragment: <testLibraryFragment>
       setters
         set vBitXor= @-1
           reference: <testLibraryFragment>::@setter::vBitXor
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vBitXor @-1
         set vBitAnd= @-1
           reference: <testLibraryFragment>::@setter::vBitAnd
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vBitAnd @-1
         set vBitOr= @-1
           reference: <testLibraryFragment>::@setter::vBitOr
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vBitOr @-1
         set vBitShiftLeft= @-1
           reference: <testLibraryFragment>::@setter::vBitShiftLeft
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vBitShiftLeft @-1
         set vBitShiftRight= @-1
           reference: <testLibraryFragment>::@setter::vBitShiftRight
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vBitShiftRight @-1
   topLevelVariables
     vBitXor
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBitXor
       getter: <none>
       setter: <none>
     vBitAnd
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBitAnd
       getter: <none>
       setter: <none>
     vBitOr
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBitOr
       getter: <none>
       setter: <none>
     vBitShiftLeft
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBitShiftLeft
       getter: <none>
       setter: <none>
     vBitShiftRight
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBitShiftRight
       getter: <none>
@@ -2315,28 +2117,22 @@
   getters
     synthetic static get vBitXor
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBitXor
     synthetic static get vBitAnd
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBitAnd
     synthetic static get vBitOr
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBitOr
     synthetic static get vBitShiftLeft
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBitShiftLeft
     synthetic static get vBitShiftRight
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBitShiftRight
   setters
     synthetic static set vBitXor=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vBitXor
           reference: <none>
@@ -2344,7 +2140,6 @@
       firstFragment: <testLibraryFragment>::@setter::vBitXor
     synthetic static set vBitAnd=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vBitAnd
           reference: <none>
@@ -2352,7 +2147,6 @@
       firstFragment: <testLibraryFragment>::@setter::vBitAnd
     synthetic static set vBitOr=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vBitOr
           reference: <none>
@@ -2360,7 +2154,6 @@
       firstFragment: <testLibraryFragment>::@setter::vBitOr
     synthetic static set vBitShiftLeft=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vBitShiftLeft
           reference: <none>
@@ -2368,7 +2161,6 @@
       firstFragment: <testLibraryFragment>::@setter::vBitShiftLeft
     synthetic static set vBitShiftRight=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vBitShiftRight
           reference: <none>
@@ -2485,78 +2277,62 @@
           fields
             a @16
               reference: <testLibraryFragment>::@class::A::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::a
               setter2: <testLibraryFragment>::@class::A::@setter::a
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::A::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set a= @-1
               reference: <testLibraryFragment>::@class::A::@setter::a
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _a @-1
           methods
             m @26
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         vSetField @39
           reference: <testLibraryFragment>::@topLevelVariable::vSetField
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vSetField
           setter2: <testLibraryFragment>::@setter::vSetField
         vInvokeMethod @71
           reference: <testLibraryFragment>::@topLevelVariable::vInvokeMethod
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInvokeMethod
           setter2: <testLibraryFragment>::@setter::vInvokeMethod
         vBoth @105
           reference: <testLibraryFragment>::@topLevelVariable::vBoth
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vBoth
           setter2: <testLibraryFragment>::@setter::vBoth
       getters
         get vSetField @-1
           reference: <testLibraryFragment>::@getter::vSetField
-          enclosingFragment: <testLibraryFragment>
         get vInvokeMethod @-1
           reference: <testLibraryFragment>::@getter::vInvokeMethod
-          enclosingFragment: <testLibraryFragment>
         get vBoth @-1
           reference: <testLibraryFragment>::@getter::vBoth
-          enclosingFragment: <testLibraryFragment>
       setters
         set vSetField= @-1
           reference: <testLibraryFragment>::@setter::vSetField
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vSetField @-1
         set vInvokeMethod= @-1
           reference: <testLibraryFragment>::@setter::vInvokeMethod
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vInvokeMethod @-1
         set vBoth= @-1
           reference: <testLibraryFragment>::@setter::vBoth
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vBoth @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::a
           getter: <none>
@@ -2568,12 +2344,10 @@
       getters
         synthetic get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::a
       setters
         synthetic set a=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _a
               reference: <none>
@@ -2586,21 +2360,18 @@
   topLevelVariables
     vSetField
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::vSetField
       getter: <none>
       setter: <none>
     vInvokeMethod
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInvokeMethod
       getter: <none>
       setter: <none>
     vBoth
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::vBoth
       getter: <none>
@@ -2608,20 +2379,16 @@
   getters
     synthetic static get vSetField
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vSetField
     synthetic static get vInvokeMethod
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInvokeMethod
     synthetic static get vBoth
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vBoth
   setters
     synthetic static set vSetField=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vSetField
           reference: <none>
@@ -2629,7 +2396,6 @@
       firstFragment: <testLibraryFragment>::@setter::vSetField
     synthetic static set vInvokeMethod=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vInvokeMethod
           reference: <none>
@@ -2637,7 +2403,6 @@
       firstFragment: <testLibraryFragment>::@setter::vInvokeMethod
     synthetic static set vBoth=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vBoth
           reference: <none>
@@ -2985,21 +2750,17 @@
           fields
             f @16
               reference: <testLibraryFragment>::@class::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::f
               setter2: <testLibraryFragment>::@class::A::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::A::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _f @-1
         class B @31
@@ -3007,21 +2768,17 @@
           fields
             a @39
               reference: <testLibraryFragment>::@class::B::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::a
               setter2: <testLibraryFragment>::@class::B::@setter::a
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::B::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set a= @-1
               reference: <testLibraryFragment>::@class::B::@setter::a
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _a @-1
         class C @50
@@ -3029,21 +2786,17 @@
           fields
             b @58
               reference: <testLibraryFragment>::@class::C::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::b
               setter2: <testLibraryFragment>::@class::C::@setter::b
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get b @-1
               reference: <testLibraryFragment>::@class::C::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set b= @-1
               reference: <testLibraryFragment>::@class::C::@setter::b
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _b @-1
         class X @69
@@ -3051,175 +2804,136 @@
           fields
             a @77
               reference: <testLibraryFragment>::@class::X::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::a
               setter2: <testLibraryFragment>::@class::X::@setter::a
             b @94
               reference: <testLibraryFragment>::@class::X::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::b
               setter2: <testLibraryFragment>::@class::X::@setter::b
             c @111
               reference: <testLibraryFragment>::@class::X::@field::c
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::c
               setter2: <testLibraryFragment>::@class::X::@setter::c
             t01 @130
               reference: <testLibraryFragment>::@class::X::@field::t01
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::t01
               setter2: <testLibraryFragment>::@class::X::@setter::t01
             t02 @147
               reference: <testLibraryFragment>::@class::X::@field::t02
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::t02
               setter2: <testLibraryFragment>::@class::X::@setter::t02
             t03 @166
               reference: <testLibraryFragment>::@class::X::@field::t03
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::t03
               setter2: <testLibraryFragment>::@class::X::@setter::t03
             t11 @187
               reference: <testLibraryFragment>::@class::X::@field::t11
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::t11
               setter2: <testLibraryFragment>::@class::X::@setter::t11
             t12 @210
               reference: <testLibraryFragment>::@class::X::@field::t12
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::t12
               setter2: <testLibraryFragment>::@class::X::@setter::t12
             t13 @235
               reference: <testLibraryFragment>::@class::X::@field::t13
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::t13
               setter2: <testLibraryFragment>::@class::X::@setter::t13
             t21 @262
               reference: <testLibraryFragment>::@class::X::@field::t21
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::t21
               setter2: <testLibraryFragment>::@class::X::@setter::t21
             t22 @284
               reference: <testLibraryFragment>::@class::X::@field::t22
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::t22
               setter2: <testLibraryFragment>::@class::X::@setter::t22
             t23 @308
               reference: <testLibraryFragment>::@class::X::@field::t23
-              enclosingFragment: <testLibraryFragment>::@class::X
               getter2: <testLibraryFragment>::@class::X::@getter::t23
               setter2: <testLibraryFragment>::@class::X::@setter::t23
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::X::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::X
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::X::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::X
             get b @-1
               reference: <testLibraryFragment>::@class::X::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::X
             get c @-1
               reference: <testLibraryFragment>::@class::X::@getter::c
-              enclosingFragment: <testLibraryFragment>::@class::X
             get t01 @-1
               reference: <testLibraryFragment>::@class::X::@getter::t01
-              enclosingFragment: <testLibraryFragment>::@class::X
             get t02 @-1
               reference: <testLibraryFragment>::@class::X::@getter::t02
-              enclosingFragment: <testLibraryFragment>::@class::X
             get t03 @-1
               reference: <testLibraryFragment>::@class::X::@getter::t03
-              enclosingFragment: <testLibraryFragment>::@class::X
             get t11 @-1
               reference: <testLibraryFragment>::@class::X::@getter::t11
-              enclosingFragment: <testLibraryFragment>::@class::X
             get t12 @-1
               reference: <testLibraryFragment>::@class::X::@getter::t12
-              enclosingFragment: <testLibraryFragment>::@class::X
             get t13 @-1
               reference: <testLibraryFragment>::@class::X::@getter::t13
-              enclosingFragment: <testLibraryFragment>::@class::X
             get t21 @-1
               reference: <testLibraryFragment>::@class::X::@getter::t21
-              enclosingFragment: <testLibraryFragment>::@class::X
             get t22 @-1
               reference: <testLibraryFragment>::@class::X::@getter::t22
-              enclosingFragment: <testLibraryFragment>::@class::X
             get t23 @-1
               reference: <testLibraryFragment>::@class::X::@getter::t23
-              enclosingFragment: <testLibraryFragment>::@class::X
           setters
             set a= @-1
               reference: <testLibraryFragment>::@class::X::@setter::a
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _a @-1
             set b= @-1
               reference: <testLibraryFragment>::@class::X::@setter::b
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _b @-1
             set c= @-1
               reference: <testLibraryFragment>::@class::X::@setter::c
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _c @-1
             set t01= @-1
               reference: <testLibraryFragment>::@class::X::@setter::t01
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _t01 @-1
             set t02= @-1
               reference: <testLibraryFragment>::@class::X::@setter::t02
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _t02 @-1
             set t03= @-1
               reference: <testLibraryFragment>::@class::X::@setter::t03
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _t03 @-1
             set t11= @-1
               reference: <testLibraryFragment>::@class::X::@setter::t11
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _t11 @-1
             set t12= @-1
               reference: <testLibraryFragment>::@class::X::@setter::t12
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _t12 @-1
             set t13= @-1
               reference: <testLibraryFragment>::@class::X::@setter::t13
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _t13 @-1
             set t21= @-1
               reference: <testLibraryFragment>::@class::X::@setter::t21
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _t21 @-1
             set t22= @-1
               reference: <testLibraryFragment>::@class::X::@setter::t22
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _t22 @-1
             set t23= @-1
               reference: <testLibraryFragment>::@class::X::@setter::t23
-              enclosingFragment: <testLibraryFragment>::@class::X
               parameters
                 _t23 @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::f
           getter: <none>
@@ -3231,12 +2945,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _f
               reference: <none>
@@ -3244,12 +2956,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::f
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: A
           firstFragment: <testLibraryFragment>::@class::B::@field::a
           getter: <none>
@@ -3261,12 +2971,10 @@
       getters
         synthetic get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::a
       setters
         synthetic set a=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _a
               reference: <none>
@@ -3274,12 +2982,10 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::a
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: B
           firstFragment: <testLibraryFragment>::@class::C::@field::b
           getter: <none>
@@ -3291,12 +2997,10 @@
       getters
         synthetic get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::b
       setters
         synthetic set b=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _b
               reference: <none>
@@ -3304,89 +3008,76 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::b
     class X
       reference: <testLibraryFragment>::@class::X
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::X
       fields
         a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: A
           firstFragment: <testLibraryFragment>::@class::X::@field::a
           getter: <none>
           setter: <none>
         b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: B
           firstFragment: <testLibraryFragment>::@class::X::@field::b
           getter: <none>
           setter: <none>
         c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: C
           firstFragment: <testLibraryFragment>::@class::X::@field::c
           getter: <none>
           setter: <none>
         t01
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: int
           firstFragment: <testLibraryFragment>::@class::X::@field::t01
           getter: <none>
           setter: <none>
         t02
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: int
           firstFragment: <testLibraryFragment>::@class::X::@field::t02
           getter: <none>
           setter: <none>
         t03
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: int
           firstFragment: <testLibraryFragment>::@class::X::@field::t03
           getter: <none>
           setter: <none>
         t11
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: int
           firstFragment: <testLibraryFragment>::@class::X::@field::t11
           getter: <none>
           setter: <none>
         t12
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: int
           firstFragment: <testLibraryFragment>::@class::X::@field::t12
           getter: <none>
           setter: <none>
         t13
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: int
           firstFragment: <testLibraryFragment>::@class::X::@field::t13
           getter: <none>
           setter: <none>
         t21
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: int
           firstFragment: <testLibraryFragment>::@class::X::@field::t21
           getter: <none>
           setter: <none>
         t22
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: int
           firstFragment: <testLibraryFragment>::@class::X::@field::t22
           getter: <none>
           setter: <none>
         t23
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           type: int
           firstFragment: <testLibraryFragment>::@class::X::@field::t23
           getter: <none>
@@ -3398,56 +3089,43 @@
       getters
         synthetic get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::a
         synthetic get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::b
         synthetic get c
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::c
         synthetic get t01
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::t01
         synthetic get t02
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::t02
         synthetic get t03
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::t03
         synthetic get t11
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::t11
         synthetic get t12
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::t12
         synthetic get t13
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::t13
         synthetic get t21
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::t21
         synthetic get t22
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::t22
         synthetic get t23
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           firstFragment: <testLibraryFragment>::@class::X::@getter::t23
       setters
         synthetic set a=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _a
               reference: <none>
@@ -3455,7 +3133,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::a
         synthetic set b=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _b
               reference: <none>
@@ -3463,7 +3140,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::b
         synthetic set c=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _c
               reference: <none>
@@ -3471,7 +3147,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::c
         synthetic set t01=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _t01
               reference: <none>
@@ -3479,7 +3154,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::t01
         synthetic set t02=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _t02
               reference: <none>
@@ -3487,7 +3161,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::t02
         synthetic set t03=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _t03
               reference: <none>
@@ -3495,7 +3168,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::t03
         synthetic set t11=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _t11
               reference: <none>
@@ -3503,7 +3175,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::t11
         synthetic set t12=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _t12
               reference: <none>
@@ -3511,7 +3182,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::t12
         synthetic set t13=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _t13
               reference: <none>
@@ -3519,7 +3189,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::t13
         synthetic set t21=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _t21
               reference: <none>
@@ -3527,7 +3196,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::t21
         synthetic set t22=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _t22
               reference: <none>
@@ -3535,7 +3203,6 @@
           firstFragment: <testLibraryFragment>::@class::X::@setter::t22
         synthetic set t23=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::X
           parameters
             requiredPositional _t23
               reference: <none>
@@ -3581,23 +3248,19 @@
       topLevelVariables
         V @4
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
           setter2: <testLibraryFragment>::@setter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
       setters
         set V= @-1
           reference: <testLibraryFragment>::@setter::V
-          enclosingFragment: <testLibraryFragment>
           parameters
             _V @-1
   topLevelVariables
     V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: num
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
@@ -3605,12 +3268,10 @@
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
   setters
     synthetic static set V=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _V
           reference: <none>
@@ -3673,43 +3334,35 @@
       topLevelVariables
         vEq @4
           reference: <testLibraryFragment>::@topLevelVariable::vEq
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vEq
           setter2: <testLibraryFragment>::@setter::vEq
         vNotEq @22
           reference: <testLibraryFragment>::@topLevelVariable::vNotEq
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNotEq
           setter2: <testLibraryFragment>::@setter::vNotEq
       getters
         get vEq @-1
           reference: <testLibraryFragment>::@getter::vEq
-          enclosingFragment: <testLibraryFragment>
         get vNotEq @-1
           reference: <testLibraryFragment>::@getter::vNotEq
-          enclosingFragment: <testLibraryFragment>
       setters
         set vEq= @-1
           reference: <testLibraryFragment>::@setter::vEq
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vEq @-1
         set vNotEq= @-1
           reference: <testLibraryFragment>::@setter::vNotEq
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNotEq @-1
   topLevelVariables
     vEq
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vEq
       getter: <none>
       setter: <none>
     vNotEq
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNotEq
       getter: <none>
@@ -3717,16 +3370,13 @@
   getters
     synthetic static get vEq
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vEq
     synthetic static get vNotEq
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNotEq
   setters
     synthetic static set vEq=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vEq
           reference: <none>
@@ -3734,7 +3384,6 @@
       firstFragment: <testLibraryFragment>::@setter::vEq
     synthetic static set vNotEq=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNotEq
           reference: <none>
@@ -3801,43 +3450,35 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         b @21
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
           setter2: <testLibraryFragment>::@setter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set b= @-1
           reference: <testLibraryFragment>::@setter::b
-          enclosingFragment: <testLibraryFragment>
           parameters
             _b @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
@@ -3845,16 +3486,13 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -3862,7 +3500,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set b=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _b
           reference: <none>
@@ -3910,23 +3547,19 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
@@ -3934,12 +3567,10 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -4019,63 +3650,51 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         b0 @22
           reference: <testLibraryFragment>::@topLevelVariable::b0
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b0
           setter2: <testLibraryFragment>::@setter::b0
         b1 @37
           reference: <testLibraryFragment>::@topLevelVariable::b1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b1
           setter2: <testLibraryFragment>::@setter::b1
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b0 @-1
           reference: <testLibraryFragment>::@getter::b0
-          enclosingFragment: <testLibraryFragment>
         get b1 @-1
           reference: <testLibraryFragment>::@getter::b1
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set b0= @-1
           reference: <testLibraryFragment>::@setter::b0
-          enclosingFragment: <testLibraryFragment>
           parameters
             _b0 @-1
         set b1= @-1
           reference: <testLibraryFragment>::@setter::b1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _b1 @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<num>
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     b0
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: num
       firstFragment: <testLibraryFragment>::@topLevelVariable::b0
       getter: <none>
       setter: <none>
     b1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: num
       firstFragment: <testLibraryFragment>::@topLevelVariable::b1
       getter: <none>
@@ -4083,20 +3702,16 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b0
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b0
     synthetic static get b1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b1
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -4104,7 +3719,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set b0=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _b0
           reference: <none>
@@ -4112,7 +3726,6 @@
       firstFragment: <testLibraryFragment>::@setter::b0
     synthetic static set b1=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _b1
           reference: <none>
@@ -4174,23 +3787,19 @@
       topLevelVariables
         x @21
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -4198,12 +3807,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -4281,48 +3888,39 @@
           fields
             f @16
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
               setter2: <testLibraryFragment>::@class::C::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::C::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _f @-1
       topLevelVariables
         x @29
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -4334,12 +3932,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _f
               reference: <none>
@@ -4348,7 +3944,6 @@
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -4356,12 +3951,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -4424,23 +4017,19 @@
       topLevelVariables
         x @21
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -4448,12 +4037,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -4515,23 +4102,19 @@
       topLevelVariables
         x @21
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -4539,12 +4122,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -4622,48 +4203,39 @@
           fields
             f @16
               reference: <testLibraryFragment>::@class::C::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::f
               setter2: <testLibraryFragment>::@class::C::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::C::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::C::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _f @-1
       topLevelVariables
         x @29
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::f
           getter: <none>
@@ -4675,12 +4247,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _f
               reference: <none>
@@ -4689,7 +4259,6 @@
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -4697,12 +4266,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -4765,23 +4332,19 @@
       topLevelVariables
         x @21
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -4789,12 +4352,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -4880,21 +4441,17 @@
           fields
             f @16
               reference: <testLibraryFragment>::@class::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::f
               setter2: <testLibraryFragment>::@class::A::@setter::f
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::A::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _f @-1
         class B @27
@@ -4902,32 +4459,26 @@
           fields
             t @44
               reference: <testLibraryFragment>::@class::B::@field::t
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::t
               setter2: <testLibraryFragment>::@class::B::@setter::t
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get t @-1
               reference: <testLibraryFragment>::@class::B::@getter::t
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set t= @-1
               reference: <testLibraryFragment>::@class::B::@setter::t
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _t @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::f
           getter: <none>
@@ -4939,12 +4490,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _f
               reference: <none>
@@ -4952,12 +4501,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::f
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         static t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::t
           getter: <none>
@@ -4969,12 +4516,10 @@
       getters
         synthetic static get t
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::t
       setters
         synthetic static set t=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _t
               reference: <none>
@@ -5067,61 +4612,49 @@
           fields
             b @17
               reference: <testLibraryFragment>::@class::C::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::b
               setter2: <testLibraryFragment>::@class::C::@setter::b
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get b @-1
               reference: <testLibraryFragment>::@class::C::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set b= @-1
               reference: <testLibraryFragment>::@class::C::@setter::b
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _b @-1
       topLevelVariables
         c @24
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         x @31
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: bool
           firstFragment: <testLibraryFragment>::@class::C::@field::b
           getter: <none>
@@ -5133,12 +4666,10 @@
       getters
         synthetic get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::b
       setters
         synthetic set b=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _b
               reference: <none>
@@ -5147,14 +4678,12 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -5162,16 +4691,13 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -5179,7 +4705,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -5282,21 +4807,17 @@
           fields
             b @17
               reference: <testLibraryFragment>::@class::I::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::I
               getter2: <testLibraryFragment>::@class::I::@getter::b
               setter2: <testLibraryFragment>::@class::I::@setter::b
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I
           getters
             get b @-1
               reference: <testLibraryFragment>::@class::I::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::I
           setters
             set b= @-1
               reference: <testLibraryFragment>::@class::I::@setter::b
-              enclosingFragment: <testLibraryFragment>::@class::I
               parameters
                 _b @-1
         class C @37
@@ -5304,45 +4825,36 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         c @57
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
         x @64
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   classes
     class I
       reference: <testLibraryFragment>::@class::I
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I
       fields
         b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           type: bool
           firstFragment: <testLibraryFragment>::@class::I::@field::b
           getter: <none>
@@ -5354,12 +4866,10 @@
       getters
         synthetic get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           firstFragment: <testLibraryFragment>::@class::I::@getter::b
       setters
         synthetic set b=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           parameters
             requiredPositional _b
               reference: <none>
@@ -5367,7 +4877,6 @@
           firstFragment: <testLibraryFragment>::@class::I::@setter::b
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -5376,14 +4885,12 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: C
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
       setter: <none>
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -5391,16 +4898,13 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -5408,7 +4912,6 @@
       firstFragment: <testLibraryFragment>::@setter::c
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -5501,21 +5004,17 @@
           fields
             b @17
               reference: <testLibraryFragment>::@class::I::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::I
               getter2: <testLibraryFragment>::@class::I::@getter::b
               setter2: <testLibraryFragment>::@class::I::@setter::b
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::I::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::I
           getters
             get b @-1
               reference: <testLibraryFragment>::@class::I::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::I
           setters
             set b= @-1
               reference: <testLibraryFragment>::@class::I::@setter::b
-              enclosingFragment: <testLibraryFragment>::@class::I
               parameters
                 _b @-1
         class C @37
@@ -5523,32 +5022,26 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
       topLevelVariables
         x @74
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   classes
     class I
       reference: <testLibraryFragment>::@class::I
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::I
       fields
         b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           type: bool
           firstFragment: <testLibraryFragment>::@class::I::@field::b
           getter: <none>
@@ -5560,12 +5053,10 @@
       getters
         synthetic get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           firstFragment: <testLibraryFragment>::@class::I::@getter::b
       setters
         synthetic set b=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::I
           parameters
             requiredPositional _b
               reference: <none>
@@ -5573,7 +5064,6 @@
           firstFragment: <testLibraryFragment>::@class::I::@setter::b
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -5582,7 +5072,6 @@
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -5590,12 +5079,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -5694,55 +5181,44 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @16
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @36
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             foo @52
               reference: <testLibraryFragment>::@class::B::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
       topLevelVariables
         x @70
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
         y @89
           reference: <testLibraryFragment>::@topLevelVariable::y
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::y
           setter2: <testLibraryFragment>::@setter::y
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
         get y @-1
           reference: <testLibraryFragment>::@getter::y
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
         set y= @-1
           reference: <testLibraryFragment>::@setter::y
-          enclosingFragment: <testLibraryFragment>
           parameters
             _y @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -5754,7 +5230,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -5769,14 +5244,12 @@
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
       setter: <none>
     y
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::y
       getter: <none>
@@ -5784,16 +5257,13 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
     synthetic static get y
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::y
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -5801,7 +5271,6 @@
       firstFragment: <testLibraryFragment>::@setter::x
     synthetic static set y=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _y
           reference: <none>
@@ -5943,123 +5412,99 @@
       topLevelVariables
         vFuture @25
           reference: <testLibraryFragment>::@topLevelVariable::vFuture
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vFuture
           setter2: <testLibraryFragment>::@setter::vFuture
         v_noParameters_inferredReturnType @60
           reference: <testLibraryFragment>::@topLevelVariable::v_noParameters_inferredReturnType
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v_noParameters_inferredReturnType
           setter2: <testLibraryFragment>::@setter::v_noParameters_inferredReturnType
         v_hasParameter_withType_inferredReturnType @110
           reference: <testLibraryFragment>::@topLevelVariable::v_hasParameter_withType_inferredReturnType
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v_hasParameter_withType_inferredReturnType
           setter2: <testLibraryFragment>::@setter::v_hasParameter_withType_inferredReturnType
         v_hasParameter_withType_returnParameter @177
           reference: <testLibraryFragment>::@topLevelVariable::v_hasParameter_withType_returnParameter
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v_hasParameter_withType_returnParameter
           setter2: <testLibraryFragment>::@setter::v_hasParameter_withType_returnParameter
         v_async_returnValue @240
           reference: <testLibraryFragment>::@topLevelVariable::v_async_returnValue
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v_async_returnValue
           setter2: <testLibraryFragment>::@setter::v_async_returnValue
         v_async_returnFuture @282
           reference: <testLibraryFragment>::@topLevelVariable::v_async_returnFuture
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v_async_returnFuture
           setter2: <testLibraryFragment>::@setter::v_async_returnFuture
       getters
         get vFuture @-1
           reference: <testLibraryFragment>::@getter::vFuture
-          enclosingFragment: <testLibraryFragment>
         get v_noParameters_inferredReturnType @-1
           reference: <testLibraryFragment>::@getter::v_noParameters_inferredReturnType
-          enclosingFragment: <testLibraryFragment>
         get v_hasParameter_withType_inferredReturnType @-1
           reference: <testLibraryFragment>::@getter::v_hasParameter_withType_inferredReturnType
-          enclosingFragment: <testLibraryFragment>
         get v_hasParameter_withType_returnParameter @-1
           reference: <testLibraryFragment>::@getter::v_hasParameter_withType_returnParameter
-          enclosingFragment: <testLibraryFragment>
         get v_async_returnValue @-1
           reference: <testLibraryFragment>::@getter::v_async_returnValue
-          enclosingFragment: <testLibraryFragment>
         get v_async_returnFuture @-1
           reference: <testLibraryFragment>::@getter::v_async_returnFuture
-          enclosingFragment: <testLibraryFragment>
       setters
         set vFuture= @-1
           reference: <testLibraryFragment>::@setter::vFuture
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vFuture @-1
         set v_noParameters_inferredReturnType= @-1
           reference: <testLibraryFragment>::@setter::v_noParameters_inferredReturnType
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v_noParameters_inferredReturnType @-1
         set v_hasParameter_withType_inferredReturnType= @-1
           reference: <testLibraryFragment>::@setter::v_hasParameter_withType_inferredReturnType
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v_hasParameter_withType_inferredReturnType @-1
         set v_hasParameter_withType_returnParameter= @-1
           reference: <testLibraryFragment>::@setter::v_hasParameter_withType_returnParameter
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v_hasParameter_withType_returnParameter @-1
         set v_async_returnValue= @-1
           reference: <testLibraryFragment>::@setter::v_async_returnValue
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v_async_returnValue @-1
         set v_async_returnFuture= @-1
           reference: <testLibraryFragment>::@setter::v_async_returnFuture
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v_async_returnFuture @-1
   topLevelVariables
     vFuture
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vFuture
       getter: <none>
       setter: <none>
     v_noParameters_inferredReturnType
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::v_noParameters_inferredReturnType
       getter: <none>
       setter: <none>
     v_hasParameter_withType_inferredReturnType
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int Function(String)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v_hasParameter_withType_inferredReturnType
       getter: <none>
       setter: <none>
     v_hasParameter_withType_returnParameter
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String Function(String)
       firstFragment: <testLibraryFragment>::@topLevelVariable::v_hasParameter_withType_returnParameter
       getter: <none>
       setter: <none>
     v_async_returnValue
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<int> Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::v_async_returnValue
       getter: <none>
       setter: <none>
     v_async_returnFuture
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Future<int> Function()
       firstFragment: <testLibraryFragment>::@topLevelVariable::v_async_returnFuture
       getter: <none>
@@ -6067,32 +5512,25 @@
   getters
     synthetic static get vFuture
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vFuture
     synthetic static get v_noParameters_inferredReturnType
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v_noParameters_inferredReturnType
     synthetic static get v_hasParameter_withType_inferredReturnType
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v_hasParameter_withType_inferredReturnType
     synthetic static get v_hasParameter_withType_returnParameter
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v_hasParameter_withType_returnParameter
     synthetic static get v_async_returnValue
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v_async_returnValue
     synthetic static get v_async_returnFuture
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v_async_returnFuture
   setters
     synthetic static set vFuture=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vFuture
           reference: <none>
@@ -6100,7 +5538,6 @@
       firstFragment: <testLibraryFragment>::@setter::vFuture
     synthetic static set v_noParameters_inferredReturnType=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v_noParameters_inferredReturnType
           reference: <none>
@@ -6108,7 +5545,6 @@
       firstFragment: <testLibraryFragment>::@setter::v_noParameters_inferredReturnType
     synthetic static set v_hasParameter_withType_inferredReturnType=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v_hasParameter_withType_inferredReturnType
           reference: <none>
@@ -6116,7 +5552,6 @@
       firstFragment: <testLibraryFragment>::@setter::v_hasParameter_withType_inferredReturnType
     synthetic static set v_hasParameter_withType_returnParameter=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v_hasParameter_withType_returnParameter
           reference: <none>
@@ -6124,7 +5559,6 @@
       firstFragment: <testLibraryFragment>::@setter::v_hasParameter_withType_returnParameter
     synthetic static set v_async_returnValue=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v_async_returnValue
           reference: <none>
@@ -6132,7 +5566,6 @@
       firstFragment: <testLibraryFragment>::@setter::v_async_returnValue
     synthetic static set v_async_returnFuture=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v_async_returnFuture
           reference: <none>
@@ -6179,23 +5612,19 @@
       topLevelVariables
         v @4
           reference: <testLibraryFragment>::@topLevelVariable::v
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v
           setter2: <testLibraryFragment>::@setter::v
       getters
         get v @-1
           reference: <testLibraryFragment>::@getter::v
-          enclosingFragment: <testLibraryFragment>
       setters
         set v= @-1
           reference: <testLibraryFragment>::@setter::v
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v @-1
   topLevelVariables
     v
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::v
       getter: <none>
@@ -6203,12 +5632,10 @@
   getters
     synthetic static get v
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v
   setters
     synthetic static set v=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v
           reference: <none>
@@ -6280,43 +5707,35 @@
       topLevelVariables
         vHasTypeArgument @22
           reference: <testLibraryFragment>::@topLevelVariable::vHasTypeArgument
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vHasTypeArgument
           setter2: <testLibraryFragment>::@setter::vHasTypeArgument
         vNoTypeArgument @55
           reference: <testLibraryFragment>::@topLevelVariable::vNoTypeArgument
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNoTypeArgument
           setter2: <testLibraryFragment>::@setter::vNoTypeArgument
       getters
         get vHasTypeArgument @-1
           reference: <testLibraryFragment>::@getter::vHasTypeArgument
-          enclosingFragment: <testLibraryFragment>
         get vNoTypeArgument @-1
           reference: <testLibraryFragment>::@getter::vNoTypeArgument
-          enclosingFragment: <testLibraryFragment>
       setters
         set vHasTypeArgument= @-1
           reference: <testLibraryFragment>::@setter::vHasTypeArgument
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vHasTypeArgument @-1
         set vNoTypeArgument= @-1
           reference: <testLibraryFragment>::@setter::vNoTypeArgument
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNoTypeArgument @-1
   topLevelVariables
     vHasTypeArgument
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vHasTypeArgument
       getter: <none>
       setter: <none>
     vNoTypeArgument
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNoTypeArgument
       getter: <none>
@@ -6324,16 +5743,13 @@
   getters
     synthetic static get vHasTypeArgument
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vHasTypeArgument
     synthetic static get vNoTypeArgument
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNoTypeArgument
   setters
     synthetic static set vHasTypeArgument=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vHasTypeArgument
           reference: <none>
@@ -6341,7 +5757,6 @@
       firstFragment: <testLibraryFragment>::@setter::vHasTypeArgument
     synthetic static set vNoTypeArgument=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNoTypeArgument
           reference: <none>
@@ -6413,43 +5828,35 @@
       topLevelVariables
         vOkArgumentType @29
           reference: <testLibraryFragment>::@topLevelVariable::vOkArgumentType
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vOkArgumentType
           setter2: <testLibraryFragment>::@setter::vOkArgumentType
         vWrongArgumentType @57
           reference: <testLibraryFragment>::@topLevelVariable::vWrongArgumentType
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vWrongArgumentType
           setter2: <testLibraryFragment>::@setter::vWrongArgumentType
       getters
         get vOkArgumentType @-1
           reference: <testLibraryFragment>::@getter::vOkArgumentType
-          enclosingFragment: <testLibraryFragment>
         get vWrongArgumentType @-1
           reference: <testLibraryFragment>::@getter::vWrongArgumentType
-          enclosingFragment: <testLibraryFragment>
       setters
         set vOkArgumentType= @-1
           reference: <testLibraryFragment>::@setter::vOkArgumentType
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vOkArgumentType @-1
         set vWrongArgumentType= @-1
           reference: <testLibraryFragment>::@setter::vWrongArgumentType
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vWrongArgumentType @-1
   topLevelVariables
     vOkArgumentType
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::vOkArgumentType
       getter: <none>
       setter: <none>
     vWrongArgumentType
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::vWrongArgumentType
       getter: <none>
@@ -6457,16 +5864,13 @@
   getters
     synthetic static get vOkArgumentType
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vOkArgumentType
     synthetic static get vWrongArgumentType
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vWrongArgumentType
   setters
     synthetic static set vOkArgumentType=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vOkArgumentType
           reference: <none>
@@ -6474,7 +5878,6 @@
       firstFragment: <testLibraryFragment>::@setter::vOkArgumentType
     synthetic static set vWrongArgumentType=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vWrongArgumentType
           reference: <none>
@@ -6732,184 +6135,144 @@
           fields
             staticClassVariable @118
               reference: <testLibraryFragment>::@class::A::@field::staticClassVariable
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::staticClassVariable
               setter2: <testLibraryFragment>::@class::A::@setter::staticClassVariable
             staticGetter @-1
               reference: <testLibraryFragment>::@class::A::@field::staticGetter
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::staticGetter
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get staticClassVariable @-1
               reference: <testLibraryFragment>::@class::A::@getter::staticClassVariable
-              enclosingFragment: <testLibraryFragment>::@class::A
             get staticGetter @160
               reference: <testLibraryFragment>::@class::A::@getter::staticGetter
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set staticClassVariable= @-1
               reference: <testLibraryFragment>::@class::A::@setter::staticClassVariable
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _staticClassVariable @-1
           methods
             staticClassMethod @195
               reference: <testLibraryFragment>::@class::A::@method::staticClassMethod
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 p @217
             instanceClassMethod @238
               reference: <testLibraryFragment>::@class::A::@method::instanceClassMethod
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 p @262
       topLevelVariables
         topLevelVariable @44
           reference: <testLibraryFragment>::@topLevelVariable::topLevelVariable
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::topLevelVariable
           setter2: <testLibraryFragment>::@setter::topLevelVariable
         r_topLevelFunction @280
           reference: <testLibraryFragment>::@topLevelVariable::r_topLevelFunction
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::r_topLevelFunction
           setter2: <testLibraryFragment>::@setter::r_topLevelFunction
         r_topLevelVariable @323
           reference: <testLibraryFragment>::@topLevelVariable::r_topLevelVariable
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::r_topLevelVariable
           setter2: <testLibraryFragment>::@setter::r_topLevelVariable
         r_topLevelGetter @366
           reference: <testLibraryFragment>::@topLevelVariable::r_topLevelGetter
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::r_topLevelGetter
           setter2: <testLibraryFragment>::@setter::r_topLevelGetter
         r_staticClassVariable @405
           reference: <testLibraryFragment>::@topLevelVariable::r_staticClassVariable
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::r_staticClassVariable
           setter2: <testLibraryFragment>::@setter::r_staticClassVariable
         r_staticGetter @456
           reference: <testLibraryFragment>::@topLevelVariable::r_staticGetter
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::r_staticGetter
           setter2: <testLibraryFragment>::@setter::r_staticGetter
         r_staticClassMethod @493
           reference: <testLibraryFragment>::@topLevelVariable::r_staticClassMethod
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::r_staticClassMethod
           setter2: <testLibraryFragment>::@setter::r_staticClassMethod
         instanceOfA @540
           reference: <testLibraryFragment>::@topLevelVariable::instanceOfA
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::instanceOfA
           setter2: <testLibraryFragment>::@setter::instanceOfA
         r_instanceClassMethod @567
           reference: <testLibraryFragment>::@topLevelVariable::r_instanceClassMethod
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::r_instanceClassMethod
           setter2: <testLibraryFragment>::@setter::r_instanceClassMethod
         synthetic topLevelGetter @-1
           reference: <testLibraryFragment>::@topLevelVariable::topLevelGetter
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::topLevelGetter
       getters
         get topLevelVariable @-1
           reference: <testLibraryFragment>::@getter::topLevelVariable
-          enclosingFragment: <testLibraryFragment>
         get r_topLevelFunction @-1
           reference: <testLibraryFragment>::@getter::r_topLevelFunction
-          enclosingFragment: <testLibraryFragment>
         get r_topLevelVariable @-1
           reference: <testLibraryFragment>::@getter::r_topLevelVariable
-          enclosingFragment: <testLibraryFragment>
         get r_topLevelGetter @-1
           reference: <testLibraryFragment>::@getter::r_topLevelGetter
-          enclosingFragment: <testLibraryFragment>
         get r_staticClassVariable @-1
           reference: <testLibraryFragment>::@getter::r_staticClassVariable
-          enclosingFragment: <testLibraryFragment>
         get r_staticGetter @-1
           reference: <testLibraryFragment>::@getter::r_staticGetter
-          enclosingFragment: <testLibraryFragment>
         get r_staticClassMethod @-1
           reference: <testLibraryFragment>::@getter::r_staticClassMethod
-          enclosingFragment: <testLibraryFragment>
         get instanceOfA @-1
           reference: <testLibraryFragment>::@getter::instanceOfA
-          enclosingFragment: <testLibraryFragment>
         get r_instanceClassMethod @-1
           reference: <testLibraryFragment>::@getter::r_instanceClassMethod
-          enclosingFragment: <testLibraryFragment>
         get topLevelGetter @74
           reference: <testLibraryFragment>::@getter::topLevelGetter
-          enclosingFragment: <testLibraryFragment>
       setters
         set topLevelVariable= @-1
           reference: <testLibraryFragment>::@setter::topLevelVariable
-          enclosingFragment: <testLibraryFragment>
           parameters
             _topLevelVariable @-1
         set r_topLevelFunction= @-1
           reference: <testLibraryFragment>::@setter::r_topLevelFunction
-          enclosingFragment: <testLibraryFragment>
           parameters
             _r_topLevelFunction @-1
         set r_topLevelVariable= @-1
           reference: <testLibraryFragment>::@setter::r_topLevelVariable
-          enclosingFragment: <testLibraryFragment>
           parameters
             _r_topLevelVariable @-1
         set r_topLevelGetter= @-1
           reference: <testLibraryFragment>::@setter::r_topLevelGetter
-          enclosingFragment: <testLibraryFragment>
           parameters
             _r_topLevelGetter @-1
         set r_staticClassVariable= @-1
           reference: <testLibraryFragment>::@setter::r_staticClassVariable
-          enclosingFragment: <testLibraryFragment>
           parameters
             _r_staticClassVariable @-1
         set r_staticGetter= @-1
           reference: <testLibraryFragment>::@setter::r_staticGetter
-          enclosingFragment: <testLibraryFragment>
           parameters
             _r_staticGetter @-1
         set r_staticClassMethod= @-1
           reference: <testLibraryFragment>::@setter::r_staticClassMethod
-          enclosingFragment: <testLibraryFragment>
           parameters
             _r_staticClassMethod @-1
         set instanceOfA= @-1
           reference: <testLibraryFragment>::@setter::instanceOfA
-          enclosingFragment: <testLibraryFragment>
           parameters
             _instanceOfA @-1
         set r_instanceClassMethod= @-1
           reference: <testLibraryFragment>::@setter::r_instanceClassMethod
-          enclosingFragment: <testLibraryFragment>
           parameters
             _r_instanceClassMethod @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static staticClassVariable
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::staticClassVariable
           getter: <none>
           setter: <none>
         synthetic static staticGetter
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::staticGetter
           getter: <none>
@@ -6920,16 +6283,13 @@
       getters
         synthetic static get staticClassVariable
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::staticClassVariable
         static get staticGetter
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::staticGetter
       setters
         synthetic static set staticClassVariable=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _staticClassVariable
               reference: <none>
@@ -6953,118 +6313,97 @@
   topLevelVariables
     topLevelVariable
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::topLevelVariable
       getter: <none>
       setter: <none>
     r_topLevelFunction
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String Function(int)
       firstFragment: <testLibraryFragment>::@topLevelVariable::r_topLevelFunction
       getter: <none>
       setter: <none>
     r_topLevelVariable
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::r_topLevelVariable
       getter: <none>
       setter: <none>
     r_topLevelGetter
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::r_topLevelGetter
       getter: <none>
       setter: <none>
     r_staticClassVariable
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::r_staticClassVariable
       getter: <none>
       setter: <none>
     r_staticGetter
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::r_staticGetter
       getter: <none>
       setter: <none>
     r_staticClassMethod
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String Function(int)
       firstFragment: <testLibraryFragment>::@topLevelVariable::r_staticClassMethod
       getter: <none>
       setter: <none>
     instanceOfA
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::instanceOfA
       getter: <none>
       setter: <none>
     r_instanceClassMethod
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String Function(int)
       firstFragment: <testLibraryFragment>::@topLevelVariable::r_instanceClassMethod
       getter: <none>
       setter: <none>
     synthetic topLevelGetter
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::topLevelGetter
       getter: <none>
   getters
     synthetic static get topLevelVariable
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::topLevelVariable
     synthetic static get r_topLevelFunction
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::r_topLevelFunction
     synthetic static get r_topLevelVariable
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::r_topLevelVariable
     synthetic static get r_topLevelGetter
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::r_topLevelGetter
     synthetic static get r_staticClassVariable
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::r_staticClassVariable
     synthetic static get r_staticGetter
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::r_staticGetter
     synthetic static get r_staticClassMethod
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::r_staticClassMethod
     synthetic static get instanceOfA
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::instanceOfA
     synthetic static get r_instanceClassMethod
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::r_instanceClassMethod
     static get topLevelGetter
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::topLevelGetter
   setters
     synthetic static set topLevelVariable=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _topLevelVariable
           reference: <none>
@@ -7072,7 +6411,6 @@
       firstFragment: <testLibraryFragment>::@setter::topLevelVariable
     synthetic static set r_topLevelFunction=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _r_topLevelFunction
           reference: <none>
@@ -7080,7 +6418,6 @@
       firstFragment: <testLibraryFragment>::@setter::r_topLevelFunction
     synthetic static set r_topLevelVariable=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _r_topLevelVariable
           reference: <none>
@@ -7088,7 +6425,6 @@
       firstFragment: <testLibraryFragment>::@setter::r_topLevelVariable
     synthetic static set r_topLevelGetter=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _r_topLevelGetter
           reference: <none>
@@ -7096,7 +6432,6 @@
       firstFragment: <testLibraryFragment>::@setter::r_topLevelGetter
     synthetic static set r_staticClassVariable=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _r_staticClassVariable
           reference: <none>
@@ -7104,7 +6439,6 @@
       firstFragment: <testLibraryFragment>::@setter::r_staticClassVariable
     synthetic static set r_staticGetter=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _r_staticGetter
           reference: <none>
@@ -7112,7 +6446,6 @@
       firstFragment: <testLibraryFragment>::@setter::r_staticGetter
     synthetic static set r_staticClassMethod=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _r_staticClassMethod
           reference: <none>
@@ -7120,7 +6453,6 @@
       firstFragment: <testLibraryFragment>::@setter::r_staticClassMethod
     synthetic static set instanceOfA=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _instanceOfA
           reference: <none>
@@ -7128,7 +6460,6 @@
       firstFragment: <testLibraryFragment>::@setter::instanceOfA
     synthetic static set r_instanceClassMethod=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _r_instanceClassMethod
           reference: <none>
@@ -7238,21 +6569,17 @@
           fields
             a @23
               reference: <testLibraryFragment>::@class::A::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::a
               setter2: <testLibraryFragment>::@class::A::@setter::a
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::A::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set a= @-1
               reference: <testLibraryFragment>::@class::A::@setter::a
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _a @-1
         class B @40
@@ -7260,48 +6587,39 @@
           fields
             b @57
               reference: <testLibraryFragment>::@class::B::@field::b
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::b
               setter2: <testLibraryFragment>::@class::B::@setter::b
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get b @-1
               reference: <testLibraryFragment>::@class::B::@getter::b
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set b= @-1
               reference: <testLibraryFragment>::@class::B::@setter::b
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _b @-1
       topLevelVariables
         c @72
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::A::@field::a
           getter: <none>
@@ -7313,12 +6631,10 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::a
       setters
         synthetic static set a=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _a
               reference: <none>
@@ -7326,12 +6642,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::a
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         static b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::B::@field::b
           getter: <none>
@@ -7343,12 +6657,10 @@
       getters
         synthetic static get b
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::b
       setters
         synthetic static set b=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _b
               reference: <none>
@@ -7357,7 +6669,6 @@
   topLevelVariables
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -7365,12 +6676,10 @@
   getters
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -7469,61 +6778,49 @@
           fields
             a @23
               reference: <testLibraryFragment>::@class::A::@field::a
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::a
               setter2: <testLibraryFragment>::@class::A::@setter::a
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get a @-1
               reference: <testLibraryFragment>::@class::A::@getter::a
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set a= @-1
               reference: <testLibraryFragment>::@class::A::@setter::a
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _a @-1
       topLevelVariables
         b @36
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
           setter2: <testLibraryFragment>::@setter::b
         c @49
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
           setter2: <testLibraryFragment>::@setter::c
       getters
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
       setters
         set b= @-1
           reference: <testLibraryFragment>::@setter::b
-          enclosingFragment: <testLibraryFragment>
           parameters
             _b @-1
         set c= @-1
           reference: <testLibraryFragment>::@setter::c
-          enclosingFragment: <testLibraryFragment>
           parameters
             _c @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         static a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::A::@field::a
           getter: <none>
@@ -7535,12 +6832,10 @@
       getters
         synthetic static get a
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::a
       setters
         synthetic static set a=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _a
               reference: <none>
@@ -7549,14 +6844,12 @@
   topLevelVariables
     b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
       setter: <none>
     c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
@@ -7564,16 +6857,13 @@
   getters
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
   setters
     synthetic static set b=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _b
           reference: <none>
@@ -7581,7 +6871,6 @@
       firstFragment: <testLibraryFragment>::@setter::b
     synthetic static set c=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _c
           reference: <none>
@@ -7656,74 +6945,58 @@
       topLevelVariables
         final a @6
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
         final b @19
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
         final c @32
           reference: <testLibraryFragment>::@topLevelVariable::c
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::c
         final d @45
           reference: <testLibraryFragment>::@topLevelVariable::d
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::d
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
         get c @-1
           reference: <testLibraryFragment>::@getter::c
-          enclosingFragment: <testLibraryFragment>
         get d @-1
           reference: <testLibraryFragment>::@getter::d
-          enclosingFragment: <testLibraryFragment>
   topLevelVariables
     final a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
     final b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
     final c
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::c
       getter: <none>
     final d
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::d
       getter: <none>
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get c
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::c
     synthetic static get d
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::d
 ''');
   }
@@ -7797,27 +7070,22 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
       topLevelVariables
         a @15
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -7826,7 +7094,6 @@
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
@@ -7834,12 +7101,10 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -7908,43 +7173,35 @@
       topLevelVariables
         s @25
           reference: <testLibraryFragment>::@topLevelVariable::s
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::s
           setter2: <testLibraryFragment>::@setter::s
         h @49
           reference: <testLibraryFragment>::@topLevelVariable::h
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::h
           setter2: <testLibraryFragment>::@setter::h
       getters
         get s @-1
           reference: <testLibraryFragment>::@getter::s
-          enclosingFragment: <testLibraryFragment>
         get h @-1
           reference: <testLibraryFragment>::@getter::h
-          enclosingFragment: <testLibraryFragment>
       setters
         set s= @-1
           reference: <testLibraryFragment>::@setter::s
-          enclosingFragment: <testLibraryFragment>
           parameters
             _s @-1
         set h= @-1
           reference: <testLibraryFragment>::@setter::h
-          enclosingFragment: <testLibraryFragment>
           parameters
             _h @-1
   topLevelVariables
     s
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::s
       getter: <none>
       setter: <none>
     h
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::h
       getter: <none>
@@ -7952,16 +7209,13 @@
   getters
     synthetic static get s
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::s
     synthetic static get h
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::h
   setters
     synthetic static set s=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _s
           reference: <none>
@@ -7969,7 +7223,6 @@
       firstFragment: <testLibraryFragment>::@setter::s
     synthetic static set h=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _h
           reference: <none>
@@ -8048,63 +7301,51 @@
       topLevelVariables
         d @8
           reference: <testLibraryFragment>::@topLevelVariable::d
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::d
           setter2: <testLibraryFragment>::@setter::d
         s @15
           reference: <testLibraryFragment>::@topLevelVariable::s
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::s
           setter2: <testLibraryFragment>::@setter::s
         h @37
           reference: <testLibraryFragment>::@topLevelVariable::h
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::h
           setter2: <testLibraryFragment>::@setter::h
       getters
         get d @-1
           reference: <testLibraryFragment>::@getter::d
-          enclosingFragment: <testLibraryFragment>
         get s @-1
           reference: <testLibraryFragment>::@getter::s
-          enclosingFragment: <testLibraryFragment>
         get h @-1
           reference: <testLibraryFragment>::@getter::h
-          enclosingFragment: <testLibraryFragment>
       setters
         set d= @-1
           reference: <testLibraryFragment>::@setter::d
-          enclosingFragment: <testLibraryFragment>
           parameters
             _d @-1
         set s= @-1
           reference: <testLibraryFragment>::@setter::s
-          enclosingFragment: <testLibraryFragment>
           parameters
             _s @-1
         set h= @-1
           reference: <testLibraryFragment>::@setter::h
-          enclosingFragment: <testLibraryFragment>
           parameters
             _h @-1
   topLevelVariables
     d
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: dynamic
       firstFragment: <testLibraryFragment>::@topLevelVariable::d
       getter: <none>
       setter: <none>
     s
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::s
       getter: <none>
       setter: <none>
     h
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::h
       getter: <none>
@@ -8112,20 +7353,16 @@
   getters
     synthetic static get d
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::d
     synthetic static get s
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::s
     synthetic static get h
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::h
   setters
     synthetic static set d=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _d
           reference: <none>
@@ -8133,7 +7370,6 @@
       firstFragment: <testLibraryFragment>::@setter::d
     synthetic static set s=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _s
           reference: <none>
@@ -8141,7 +7377,6 @@
       firstFragment: <testLibraryFragment>::@setter::s
     synthetic static set h=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _h
           reference: <none>
@@ -8204,43 +7439,35 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         b @17
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
           setter2: <testLibraryFragment>::@setter::b
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set b= @-1
           reference: <testLibraryFragment>::@setter::b
-          enclosingFragment: <testLibraryFragment>
           parameters
             _b @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
@@ -8248,16 +7475,13 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -8265,7 +7489,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set b=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _b
           reference: <none>
@@ -8390,83 +7613,67 @@
       topLevelVariables
         vObject @4
           reference: <testLibraryFragment>::@topLevelVariable::vObject
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vObject
           setter2: <testLibraryFragment>::@setter::vObject
         vNum @37
           reference: <testLibraryFragment>::@topLevelVariable::vNum
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNum
           setter2: <testLibraryFragment>::@setter::vNum
         vNumEmpty @64
           reference: <testLibraryFragment>::@topLevelVariable::vNumEmpty
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNumEmpty
           setter2: <testLibraryFragment>::@setter::vNumEmpty
         vInt @89
           reference: <testLibraryFragment>::@topLevelVariable::vInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInt
           setter2: <testLibraryFragment>::@setter::vInt
       getters
         get vObject @-1
           reference: <testLibraryFragment>::@getter::vObject
-          enclosingFragment: <testLibraryFragment>
         get vNum @-1
           reference: <testLibraryFragment>::@getter::vNum
-          enclosingFragment: <testLibraryFragment>
         get vNumEmpty @-1
           reference: <testLibraryFragment>::@getter::vNumEmpty
-          enclosingFragment: <testLibraryFragment>
         get vInt @-1
           reference: <testLibraryFragment>::@getter::vInt
-          enclosingFragment: <testLibraryFragment>
       setters
         set vObject= @-1
           reference: <testLibraryFragment>::@setter::vObject
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vObject @-1
         set vNum= @-1
           reference: <testLibraryFragment>::@setter::vNum
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNum @-1
         set vNumEmpty= @-1
           reference: <testLibraryFragment>::@setter::vNumEmpty
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNumEmpty @-1
         set vInt= @-1
           reference: <testLibraryFragment>::@setter::vInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vInt @-1
   topLevelVariables
     vObject
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<Object>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vObject
       getter: <none>
       setter: <none>
     vNum
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<num>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNum
       getter: <none>
       setter: <none>
     vNumEmpty
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<num>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNumEmpty
       getter: <none>
       setter: <none>
     vInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInt
       getter: <none>
@@ -8474,24 +7681,19 @@
   getters
     synthetic static get vObject
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vObject
     synthetic static get vNum
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNum
     synthetic static get vNumEmpty
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNumEmpty
     synthetic static get vInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInt
   setters
     synthetic static set vObject=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vObject
           reference: <none>
@@ -8499,7 +7701,6 @@
       firstFragment: <testLibraryFragment>::@setter::vObject
     synthetic static set vNum=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNum
           reference: <none>
@@ -8507,7 +7708,6 @@
       firstFragment: <testLibraryFragment>::@setter::vNum
     synthetic static set vNumEmpty=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNumEmpty
           reference: <none>
@@ -8515,7 +7715,6 @@
       firstFragment: <testLibraryFragment>::@setter::vNumEmpty
     synthetic static set vInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vInt
           reference: <none>
@@ -8595,63 +7794,51 @@
       topLevelVariables
         vInt @4
           reference: <testLibraryFragment>::@topLevelVariable::vInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInt
           setter2: <testLibraryFragment>::@setter::vInt
         vNum @26
           reference: <testLibraryFragment>::@topLevelVariable::vNum
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNum
           setter2: <testLibraryFragment>::@setter::vNum
         vObject @47
           reference: <testLibraryFragment>::@topLevelVariable::vObject
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vObject
           setter2: <testLibraryFragment>::@setter::vObject
       getters
         get vInt @-1
           reference: <testLibraryFragment>::@getter::vInt
-          enclosingFragment: <testLibraryFragment>
         get vNum @-1
           reference: <testLibraryFragment>::@getter::vNum
-          enclosingFragment: <testLibraryFragment>
         get vObject @-1
           reference: <testLibraryFragment>::@getter::vObject
-          enclosingFragment: <testLibraryFragment>
       setters
         set vInt= @-1
           reference: <testLibraryFragment>::@setter::vInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vInt @-1
         set vNum= @-1
           reference: <testLibraryFragment>::@setter::vNum
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNum @-1
         set vObject= @-1
           reference: <testLibraryFragment>::@setter::vObject
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vObject @-1
   topLevelVariables
     vInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInt
       getter: <none>
       setter: <none>
     vNum
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<num>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNum
       getter: <none>
       setter: <none>
     vObject
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<Object>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vObject
       getter: <none>
@@ -8659,20 +7846,16 @@
   getters
     synthetic static get vInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInt
     synthetic static get vNum
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNum
     synthetic static get vObject
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vObject
   setters
     synthetic static set vInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vInt
           reference: <none>
@@ -8680,7 +7863,6 @@
       firstFragment: <testLibraryFragment>::@setter::vInt
     synthetic static set vNum=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNum
           reference: <none>
@@ -8688,7 +7870,6 @@
       firstFragment: <testLibraryFragment>::@setter::vNum
     synthetic static set vObject=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vObject
           reference: <none>
@@ -8814,103 +7995,83 @@
       topLevelVariables
         vObjectObject @4
           reference: <testLibraryFragment>::@topLevelVariable::vObjectObject
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vObjectObject
           setter2: <testLibraryFragment>::@setter::vObjectObject
         vComparableObject @50
           reference: <testLibraryFragment>::@topLevelVariable::vComparableObject
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vComparableObject
           setter2: <testLibraryFragment>::@setter::vComparableObject
         vNumString @109
           reference: <testLibraryFragment>::@topLevelVariable::vNumString
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNumString
           setter2: <testLibraryFragment>::@setter::vNumString
         vNumStringEmpty @149
           reference: <testLibraryFragment>::@topLevelVariable::vNumStringEmpty
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNumStringEmpty
           setter2: <testLibraryFragment>::@setter::vNumStringEmpty
         vIntString @188
           reference: <testLibraryFragment>::@topLevelVariable::vIntString
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIntString
           setter2: <testLibraryFragment>::@setter::vIntString
       getters
         get vObjectObject @-1
           reference: <testLibraryFragment>::@getter::vObjectObject
-          enclosingFragment: <testLibraryFragment>
         get vComparableObject @-1
           reference: <testLibraryFragment>::@getter::vComparableObject
-          enclosingFragment: <testLibraryFragment>
         get vNumString @-1
           reference: <testLibraryFragment>::@getter::vNumString
-          enclosingFragment: <testLibraryFragment>
         get vNumStringEmpty @-1
           reference: <testLibraryFragment>::@getter::vNumStringEmpty
-          enclosingFragment: <testLibraryFragment>
         get vIntString @-1
           reference: <testLibraryFragment>::@getter::vIntString
-          enclosingFragment: <testLibraryFragment>
       setters
         set vObjectObject= @-1
           reference: <testLibraryFragment>::@setter::vObjectObject
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vObjectObject @-1
         set vComparableObject= @-1
           reference: <testLibraryFragment>::@setter::vComparableObject
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vComparableObject @-1
         set vNumString= @-1
           reference: <testLibraryFragment>::@setter::vNumString
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNumString @-1
         set vNumStringEmpty= @-1
           reference: <testLibraryFragment>::@setter::vNumStringEmpty
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNumStringEmpty @-1
         set vIntString= @-1
           reference: <testLibraryFragment>::@setter::vIntString
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIntString @-1
   topLevelVariables
     vObjectObject
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<Object, Object>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vObjectObject
       getter: <none>
       setter: <none>
     vComparableObject
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<Comparable<int>, Object>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vComparableObject
       getter: <none>
       setter: <none>
     vNumString
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<num, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNumString
       getter: <none>
       setter: <none>
     vNumStringEmpty
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<num, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNumStringEmpty
       getter: <none>
       setter: <none>
     vIntString
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIntString
       getter: <none>
@@ -8918,28 +8079,22 @@
   getters
     synthetic static get vObjectObject
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vObjectObject
     synthetic static get vComparableObject
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vComparableObject
     synthetic static get vNumString
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNumString
     synthetic static get vNumStringEmpty
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNumStringEmpty
     synthetic static get vIntString
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIntString
   setters
     synthetic static set vObjectObject=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vObjectObject
           reference: <none>
@@ -8947,7 +8102,6 @@
       firstFragment: <testLibraryFragment>::@setter::vObjectObject
     synthetic static set vComparableObject=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vComparableObject
           reference: <none>
@@ -8955,7 +8109,6 @@
       firstFragment: <testLibraryFragment>::@setter::vComparableObject
     synthetic static set vNumString=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNumString
           reference: <none>
@@ -8963,7 +8116,6 @@
       firstFragment: <testLibraryFragment>::@setter::vNumString
     synthetic static set vNumStringEmpty=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNumStringEmpty
           reference: <none>
@@ -8971,7 +8123,6 @@
       firstFragment: <testLibraryFragment>::@setter::vNumStringEmpty
     synthetic static set vIntString=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIntString
           reference: <none>
@@ -9051,63 +8202,51 @@
       topLevelVariables
         vIntString @4
           reference: <testLibraryFragment>::@topLevelVariable::vIntString
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIntString
           setter2: <testLibraryFragment>::@setter::vIntString
         vNumString @39
           reference: <testLibraryFragment>::@topLevelVariable::vNumString
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNumString
           setter2: <testLibraryFragment>::@setter::vNumString
         vIntObject @76
           reference: <testLibraryFragment>::@topLevelVariable::vIntObject
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIntObject
           setter2: <testLibraryFragment>::@setter::vIntObject
       getters
         get vIntString @-1
           reference: <testLibraryFragment>::@getter::vIntString
-          enclosingFragment: <testLibraryFragment>
         get vNumString @-1
           reference: <testLibraryFragment>::@getter::vNumString
-          enclosingFragment: <testLibraryFragment>
         get vIntObject @-1
           reference: <testLibraryFragment>::@getter::vIntObject
-          enclosingFragment: <testLibraryFragment>
       setters
         set vIntString= @-1
           reference: <testLibraryFragment>::@setter::vIntString
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIntString @-1
         set vNumString= @-1
           reference: <testLibraryFragment>::@setter::vNumString
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNumString @-1
         set vIntObject= @-1
           reference: <testLibraryFragment>::@setter::vIntObject
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIntObject @-1
   topLevelVariables
     vIntString
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<int, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIntString
       getter: <none>
       setter: <none>
     vNumString
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<num, String>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNumString
       getter: <none>
       setter: <none>
     vIntObject
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: Map<int, Object>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIntObject
       getter: <none>
@@ -9115,20 +8254,16 @@
   getters
     synthetic static get vIntString
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIntString
     synthetic static get vNumString
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNumString
     synthetic static get vIntObject
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIntObject
   setters
     synthetic static set vIntString=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIntString
           reference: <none>
@@ -9136,7 +8271,6 @@
       firstFragment: <testLibraryFragment>::@setter::vIntString
     synthetic static set vNumString=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNumString
           reference: <none>
@@ -9144,7 +8278,6 @@
       firstFragment: <testLibraryFragment>::@setter::vNumString
     synthetic static set vIntObject=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIntObject
           reference: <none>
@@ -9270,103 +8403,83 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         b @18
           reference: <testLibraryFragment>::@topLevelVariable::b
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::b
           setter2: <testLibraryFragment>::@setter::b
         vEq @32
           reference: <testLibraryFragment>::@topLevelVariable::vEq
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vEq
           setter2: <testLibraryFragment>::@setter::vEq
         vAnd @50
           reference: <testLibraryFragment>::@topLevelVariable::vAnd
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vAnd
           setter2: <testLibraryFragment>::@setter::vAnd
         vOr @69
           reference: <testLibraryFragment>::@topLevelVariable::vOr
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vOr
           setter2: <testLibraryFragment>::@setter::vOr
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get b @-1
           reference: <testLibraryFragment>::@getter::b
-          enclosingFragment: <testLibraryFragment>
         get vEq @-1
           reference: <testLibraryFragment>::@getter::vEq
-          enclosingFragment: <testLibraryFragment>
         get vAnd @-1
           reference: <testLibraryFragment>::@getter::vAnd
-          enclosingFragment: <testLibraryFragment>
         get vOr @-1
           reference: <testLibraryFragment>::@getter::vOr
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set b= @-1
           reference: <testLibraryFragment>::@setter::b
-          enclosingFragment: <testLibraryFragment>
           parameters
             _b @-1
         set vEq= @-1
           reference: <testLibraryFragment>::@setter::vEq
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vEq @-1
         set vAnd= @-1
           reference: <testLibraryFragment>::@setter::vAnd
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vAnd @-1
         set vOr= @-1
           reference: <testLibraryFragment>::@setter::vOr
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vOr @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     b
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::b
       getter: <none>
       setter: <none>
     vEq
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vEq
       getter: <none>
       setter: <none>
     vAnd
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vAnd
       getter: <none>
       setter: <none>
     vOr
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vOr
       getter: <none>
@@ -9374,28 +8487,22 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get b
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::b
     synthetic static get vEq
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vEq
     synthetic static get vAnd
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vAnd
     synthetic static get vOr
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vOr
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -9403,7 +8510,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set b=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _b
           reference: <none>
@@ -9411,7 +8517,6 @@
       firstFragment: <testLibraryFragment>::@setter::b
     synthetic static set vEq=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vEq
           reference: <none>
@@ -9419,7 +8524,6 @@
       firstFragment: <testLibraryFragment>::@setter::vEq
     synthetic static set vAnd=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vAnd
           reference: <none>
@@ -9427,7 +8531,6 @@
       firstFragment: <testLibraryFragment>::@setter::vAnd
     synthetic static set vOr=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vOr
           reference: <none>
@@ -9548,59 +8651,47 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 p @25
       topLevelVariables
         instanceOfA @43
           reference: <testLibraryFragment>::@topLevelVariable::instanceOfA
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::instanceOfA
           setter2: <testLibraryFragment>::@setter::instanceOfA
         v1 @70
           reference: <testLibraryFragment>::@topLevelVariable::v1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v1
           setter2: <testLibraryFragment>::@setter::v1
         v2 @96
           reference: <testLibraryFragment>::@topLevelVariable::v2
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::v2
           setter2: <testLibraryFragment>::@setter::v2
       getters
         get instanceOfA @-1
           reference: <testLibraryFragment>::@getter::instanceOfA
-          enclosingFragment: <testLibraryFragment>
         get v1 @-1
           reference: <testLibraryFragment>::@getter::v1
-          enclosingFragment: <testLibraryFragment>
         get v2 @-1
           reference: <testLibraryFragment>::@getter::v2
-          enclosingFragment: <testLibraryFragment>
       setters
         set instanceOfA= @-1
           reference: <testLibraryFragment>::@setter::instanceOfA
-          enclosingFragment: <testLibraryFragment>
           parameters
             _instanceOfA @-1
         set v1= @-1
           reference: <testLibraryFragment>::@setter::v1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v1 @-1
         set v2= @-1
           reference: <testLibraryFragment>::@setter::v2
-          enclosingFragment: <testLibraryFragment>
           parameters
             _v2 @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -9617,21 +8708,18 @@
   topLevelVariables
     instanceOfA
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: A
       firstFragment: <testLibraryFragment>::@topLevelVariable::instanceOfA
       getter: <none>
       setter: <none>
     v1
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::v1
       getter: <none>
       setter: <none>
     v2
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: String
       firstFragment: <testLibraryFragment>::@topLevelVariable::v2
       getter: <none>
@@ -9639,20 +8727,16 @@
   getters
     synthetic static get instanceOfA
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::instanceOfA
     synthetic static get v1
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v1
     synthetic static get v2
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::v2
   setters
     synthetic static set instanceOfA=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _instanceOfA
           reference: <none>
@@ -9660,7 +8744,6 @@
       firstFragment: <testLibraryFragment>::@setter::instanceOfA
     synthetic static set v1=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v1
           reference: <none>
@@ -9668,7 +8751,6 @@
       firstFragment: <testLibraryFragment>::@setter::v1
     synthetic static set v2=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _v2
           reference: <none>
@@ -9884,223 +8966,179 @@
       topLevelVariables
         vModuloIntInt @4
           reference: <testLibraryFragment>::@topLevelVariable::vModuloIntInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vModuloIntInt
           setter2: <testLibraryFragment>::@setter::vModuloIntInt
         vModuloIntDouble @31
           reference: <testLibraryFragment>::@topLevelVariable::vModuloIntDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vModuloIntDouble
           setter2: <testLibraryFragment>::@setter::vModuloIntDouble
         vMultiplyIntInt @63
           reference: <testLibraryFragment>::@topLevelVariable::vMultiplyIntInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vMultiplyIntInt
           setter2: <testLibraryFragment>::@setter::vMultiplyIntInt
         vMultiplyIntDouble @92
           reference: <testLibraryFragment>::@topLevelVariable::vMultiplyIntDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vMultiplyIntDouble
           setter2: <testLibraryFragment>::@setter::vMultiplyIntDouble
         vMultiplyDoubleInt @126
           reference: <testLibraryFragment>::@topLevelVariable::vMultiplyDoubleInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vMultiplyDoubleInt
           setter2: <testLibraryFragment>::@setter::vMultiplyDoubleInt
         vMultiplyDoubleDouble @160
           reference: <testLibraryFragment>::@topLevelVariable::vMultiplyDoubleDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vMultiplyDoubleDouble
           setter2: <testLibraryFragment>::@setter::vMultiplyDoubleDouble
         vDivideIntInt @199
           reference: <testLibraryFragment>::@topLevelVariable::vDivideIntInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDivideIntInt
           setter2: <testLibraryFragment>::@setter::vDivideIntInt
         vDivideIntDouble @226
           reference: <testLibraryFragment>::@topLevelVariable::vDivideIntDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDivideIntDouble
           setter2: <testLibraryFragment>::@setter::vDivideIntDouble
         vDivideDoubleInt @258
           reference: <testLibraryFragment>::@topLevelVariable::vDivideDoubleInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDivideDoubleInt
           setter2: <testLibraryFragment>::@setter::vDivideDoubleInt
         vDivideDoubleDouble @290
           reference: <testLibraryFragment>::@topLevelVariable::vDivideDoubleDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDivideDoubleDouble
           setter2: <testLibraryFragment>::@setter::vDivideDoubleDouble
         vFloorDivide @327
           reference: <testLibraryFragment>::@topLevelVariable::vFloorDivide
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vFloorDivide
           setter2: <testLibraryFragment>::@setter::vFloorDivide
       getters
         get vModuloIntInt @-1
           reference: <testLibraryFragment>::@getter::vModuloIntInt
-          enclosingFragment: <testLibraryFragment>
         get vModuloIntDouble @-1
           reference: <testLibraryFragment>::@getter::vModuloIntDouble
-          enclosingFragment: <testLibraryFragment>
         get vMultiplyIntInt @-1
           reference: <testLibraryFragment>::@getter::vMultiplyIntInt
-          enclosingFragment: <testLibraryFragment>
         get vMultiplyIntDouble @-1
           reference: <testLibraryFragment>::@getter::vMultiplyIntDouble
-          enclosingFragment: <testLibraryFragment>
         get vMultiplyDoubleInt @-1
           reference: <testLibraryFragment>::@getter::vMultiplyDoubleInt
-          enclosingFragment: <testLibraryFragment>
         get vMultiplyDoubleDouble @-1
           reference: <testLibraryFragment>::@getter::vMultiplyDoubleDouble
-          enclosingFragment: <testLibraryFragment>
         get vDivideIntInt @-1
           reference: <testLibraryFragment>::@getter::vDivideIntInt
-          enclosingFragment: <testLibraryFragment>
         get vDivideIntDouble @-1
           reference: <testLibraryFragment>::@getter::vDivideIntDouble
-          enclosingFragment: <testLibraryFragment>
         get vDivideDoubleInt @-1
           reference: <testLibraryFragment>::@getter::vDivideDoubleInt
-          enclosingFragment: <testLibraryFragment>
         get vDivideDoubleDouble @-1
           reference: <testLibraryFragment>::@getter::vDivideDoubleDouble
-          enclosingFragment: <testLibraryFragment>
         get vFloorDivide @-1
           reference: <testLibraryFragment>::@getter::vFloorDivide
-          enclosingFragment: <testLibraryFragment>
       setters
         set vModuloIntInt= @-1
           reference: <testLibraryFragment>::@setter::vModuloIntInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vModuloIntInt @-1
         set vModuloIntDouble= @-1
           reference: <testLibraryFragment>::@setter::vModuloIntDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vModuloIntDouble @-1
         set vMultiplyIntInt= @-1
           reference: <testLibraryFragment>::@setter::vMultiplyIntInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vMultiplyIntInt @-1
         set vMultiplyIntDouble= @-1
           reference: <testLibraryFragment>::@setter::vMultiplyIntDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vMultiplyIntDouble @-1
         set vMultiplyDoubleInt= @-1
           reference: <testLibraryFragment>::@setter::vMultiplyDoubleInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vMultiplyDoubleInt @-1
         set vMultiplyDoubleDouble= @-1
           reference: <testLibraryFragment>::@setter::vMultiplyDoubleDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vMultiplyDoubleDouble @-1
         set vDivideIntInt= @-1
           reference: <testLibraryFragment>::@setter::vDivideIntInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDivideIntInt @-1
         set vDivideIntDouble= @-1
           reference: <testLibraryFragment>::@setter::vDivideIntDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDivideIntDouble @-1
         set vDivideDoubleInt= @-1
           reference: <testLibraryFragment>::@setter::vDivideDoubleInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDivideDoubleInt @-1
         set vDivideDoubleDouble= @-1
           reference: <testLibraryFragment>::@setter::vDivideDoubleDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDivideDoubleDouble @-1
         set vFloorDivide= @-1
           reference: <testLibraryFragment>::@setter::vFloorDivide
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vFloorDivide @-1
   topLevelVariables
     vModuloIntInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vModuloIntInt
       getter: <none>
       setter: <none>
     vModuloIntDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vModuloIntDouble
       getter: <none>
       setter: <none>
     vMultiplyIntInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vMultiplyIntInt
       getter: <none>
       setter: <none>
     vMultiplyIntDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vMultiplyIntDouble
       getter: <none>
       setter: <none>
     vMultiplyDoubleInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vMultiplyDoubleInt
       getter: <none>
       setter: <none>
     vMultiplyDoubleDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vMultiplyDoubleDouble
       getter: <none>
       setter: <none>
     vDivideIntInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDivideIntInt
       getter: <none>
       setter: <none>
     vDivideIntDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDivideIntDouble
       getter: <none>
       setter: <none>
     vDivideDoubleInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDivideDoubleInt
       getter: <none>
       setter: <none>
     vDivideDoubleDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDivideDoubleDouble
       getter: <none>
       setter: <none>
     vFloorDivide
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vFloorDivide
       getter: <none>
@@ -10108,52 +9146,40 @@
   getters
     synthetic static get vModuloIntInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vModuloIntInt
     synthetic static get vModuloIntDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vModuloIntDouble
     synthetic static get vMultiplyIntInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vMultiplyIntInt
     synthetic static get vMultiplyIntDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vMultiplyIntDouble
     synthetic static get vMultiplyDoubleInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vMultiplyDoubleInt
     synthetic static get vMultiplyDoubleDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vMultiplyDoubleDouble
     synthetic static get vDivideIntInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDivideIntInt
     synthetic static get vDivideIntDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDivideIntDouble
     synthetic static get vDivideDoubleInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDivideDoubleInt
     synthetic static get vDivideDoubleDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDivideDoubleDouble
     synthetic static get vFloorDivide
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vFloorDivide
   setters
     synthetic static set vModuloIntInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vModuloIntInt
           reference: <none>
@@ -10161,7 +9187,6 @@
       firstFragment: <testLibraryFragment>::@setter::vModuloIntInt
     synthetic static set vModuloIntDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vModuloIntDouble
           reference: <none>
@@ -10169,7 +9194,6 @@
       firstFragment: <testLibraryFragment>::@setter::vModuloIntDouble
     synthetic static set vMultiplyIntInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vMultiplyIntInt
           reference: <none>
@@ -10177,7 +9201,6 @@
       firstFragment: <testLibraryFragment>::@setter::vMultiplyIntInt
     synthetic static set vMultiplyIntDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vMultiplyIntDouble
           reference: <none>
@@ -10185,7 +9208,6 @@
       firstFragment: <testLibraryFragment>::@setter::vMultiplyIntDouble
     synthetic static set vMultiplyDoubleInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vMultiplyDoubleInt
           reference: <none>
@@ -10193,7 +9215,6 @@
       firstFragment: <testLibraryFragment>::@setter::vMultiplyDoubleInt
     synthetic static set vMultiplyDoubleDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vMultiplyDoubleDouble
           reference: <none>
@@ -10201,7 +9222,6 @@
       firstFragment: <testLibraryFragment>::@setter::vMultiplyDoubleDouble
     synthetic static set vDivideIntInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDivideIntInt
           reference: <none>
@@ -10209,7 +9229,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDivideIntInt
     synthetic static set vDivideIntDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDivideIntDouble
           reference: <none>
@@ -10217,7 +9236,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDivideIntDouble
     synthetic static set vDivideDoubleInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDivideDoubleInt
           reference: <none>
@@ -10225,7 +9243,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDivideDoubleInt
     synthetic static set vDivideDoubleDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDivideDoubleDouble
           reference: <none>
@@ -10233,7 +9250,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDivideDoubleDouble
     synthetic static set vFloorDivide=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vFloorDivide
           reference: <none>
@@ -10313,63 +9329,51 @@
       topLevelVariables
         a @4
           reference: <testLibraryFragment>::@topLevelVariable::a
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::a
           setter2: <testLibraryFragment>::@setter::a
         vEq @15
           reference: <testLibraryFragment>::@topLevelVariable::vEq
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vEq
           setter2: <testLibraryFragment>::@setter::vEq
         vNotEq @46
           reference: <testLibraryFragment>::@topLevelVariable::vNotEq
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNotEq
           setter2: <testLibraryFragment>::@setter::vNotEq
       getters
         get a @-1
           reference: <testLibraryFragment>::@getter::a
-          enclosingFragment: <testLibraryFragment>
         get vEq @-1
           reference: <testLibraryFragment>::@getter::vEq
-          enclosingFragment: <testLibraryFragment>
         get vNotEq @-1
           reference: <testLibraryFragment>::@getter::vNotEq
-          enclosingFragment: <testLibraryFragment>
       setters
         set a= @-1
           reference: <testLibraryFragment>::@setter::a
-          enclosingFragment: <testLibraryFragment>
           parameters
             _a @-1
         set vEq= @-1
           reference: <testLibraryFragment>::@setter::vEq
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vEq @-1
         set vNotEq= @-1
           reference: <testLibraryFragment>::@setter::vNotEq
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNotEq @-1
   topLevelVariables
     a
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::a
       getter: <none>
       setter: <none>
     vEq
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vEq
       getter: <none>
       setter: <none>
     vNotEq
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNotEq
       getter: <none>
@@ -10377,20 +9381,16 @@
   getters
     synthetic static get a
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::a
     synthetic static get vEq
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vEq
     synthetic static get vNotEq
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNotEq
   setters
     synthetic static set a=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _a
           reference: <none>
@@ -10398,7 +9398,6 @@
       firstFragment: <testLibraryFragment>::@setter::a
     synthetic static set vEq=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vEq
           reference: <none>
@@ -10406,7 +9405,6 @@
       firstFragment: <testLibraryFragment>::@setter::vEq
     synthetic static set vNotEq=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNotEq
           reference: <none>
@@ -10452,23 +9450,19 @@
       topLevelVariables
         V @4
           reference: <testLibraryFragment>::@topLevelVariable::V
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::V
           setter2: <testLibraryFragment>::@setter::V
       getters
         get V @-1
           reference: <testLibraryFragment>::@getter::V
-          enclosingFragment: <testLibraryFragment>
       setters
         set V= @-1
           reference: <testLibraryFragment>::@setter::V
-          enclosingFragment: <testLibraryFragment>
           parameters
             _V @-1
   topLevelVariables
     V
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::V
       getter: <none>
@@ -10476,12 +9470,10 @@
   getters
     synthetic static get V
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::V
   setters
     synthetic static set V=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _V
           reference: <none>
@@ -10612,123 +9604,99 @@
       topLevelVariables
         vInt @4
           reference: <testLibraryFragment>::@topLevelVariable::vInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInt
           setter2: <testLibraryFragment>::@setter::vInt
         vDouble @18
           reference: <testLibraryFragment>::@topLevelVariable::vDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDouble
           setter2: <testLibraryFragment>::@setter::vDouble
         vIncInt @37
           reference: <testLibraryFragment>::@topLevelVariable::vIncInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIncInt
           setter2: <testLibraryFragment>::@setter::vIncInt
         vDecInt @59
           reference: <testLibraryFragment>::@topLevelVariable::vDecInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDecInt
           setter2: <testLibraryFragment>::@setter::vDecInt
         vIncDouble @81
           reference: <testLibraryFragment>::@topLevelVariable::vIncDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIncDouble
           setter2: <testLibraryFragment>::@setter::vIncDouble
         vDecDouble @109
           reference: <testLibraryFragment>::@topLevelVariable::vDecDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDecDouble
           setter2: <testLibraryFragment>::@setter::vDecDouble
       getters
         get vInt @-1
           reference: <testLibraryFragment>::@getter::vInt
-          enclosingFragment: <testLibraryFragment>
         get vDouble @-1
           reference: <testLibraryFragment>::@getter::vDouble
-          enclosingFragment: <testLibraryFragment>
         get vIncInt @-1
           reference: <testLibraryFragment>::@getter::vIncInt
-          enclosingFragment: <testLibraryFragment>
         get vDecInt @-1
           reference: <testLibraryFragment>::@getter::vDecInt
-          enclosingFragment: <testLibraryFragment>
         get vIncDouble @-1
           reference: <testLibraryFragment>::@getter::vIncDouble
-          enclosingFragment: <testLibraryFragment>
         get vDecDouble @-1
           reference: <testLibraryFragment>::@getter::vDecDouble
-          enclosingFragment: <testLibraryFragment>
       setters
         set vInt= @-1
           reference: <testLibraryFragment>::@setter::vInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vInt @-1
         set vDouble= @-1
           reference: <testLibraryFragment>::@setter::vDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDouble @-1
         set vIncInt= @-1
           reference: <testLibraryFragment>::@setter::vIncInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIncInt @-1
         set vDecInt= @-1
           reference: <testLibraryFragment>::@setter::vDecInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDecInt @-1
         set vIncDouble= @-1
           reference: <testLibraryFragment>::@setter::vIncDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIncDouble @-1
         set vDecDouble= @-1
           reference: <testLibraryFragment>::@setter::vDecDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDecDouble @-1
   topLevelVariables
     vInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInt
       getter: <none>
       setter: <none>
     vDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDouble
       getter: <none>
       setter: <none>
     vIncInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIncInt
       getter: <none>
       setter: <none>
     vDecInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDecInt
       getter: <none>
       setter: <none>
     vIncDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIncDouble
       getter: <none>
       setter: <none>
     vDecDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDecDouble
       getter: <none>
@@ -10736,32 +9704,25 @@
   getters
     synthetic static get vInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInt
     synthetic static get vDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDouble
     synthetic static get vIncInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIncInt
     synthetic static get vDecInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDecInt
     synthetic static get vIncDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIncDouble
     synthetic static get vDecDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDecDouble
   setters
     synthetic static set vInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vInt
           reference: <none>
@@ -10769,7 +9730,6 @@
       firstFragment: <testLibraryFragment>::@setter::vInt
     synthetic static set vDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDouble
           reference: <none>
@@ -10777,7 +9737,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDouble
     synthetic static set vIncInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIncInt
           reference: <none>
@@ -10785,7 +9744,6 @@
       firstFragment: <testLibraryFragment>::@setter::vIncInt
     synthetic static set vDecInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDecInt
           reference: <none>
@@ -10793,7 +9751,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDecInt
     synthetic static set vIncDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIncDouble
           reference: <none>
@@ -10801,7 +9758,6 @@
       firstFragment: <testLibraryFragment>::@setter::vIncDouble
     synthetic static set vDecDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDecDouble
           reference: <none>
@@ -10932,123 +9888,99 @@
       topLevelVariables
         vInt @4
           reference: <testLibraryFragment>::@topLevelVariable::vInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInt
           setter2: <testLibraryFragment>::@setter::vInt
         vDouble @20
           reference: <testLibraryFragment>::@topLevelVariable::vDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDouble
           setter2: <testLibraryFragment>::@setter::vDouble
         vIncInt @41
           reference: <testLibraryFragment>::@topLevelVariable::vIncInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIncInt
           setter2: <testLibraryFragment>::@setter::vIncInt
         vDecInt @66
           reference: <testLibraryFragment>::@topLevelVariable::vDecInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDecInt
           setter2: <testLibraryFragment>::@setter::vDecInt
         vIncDouble @91
           reference: <testLibraryFragment>::@topLevelVariable::vIncDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIncDouble
           setter2: <testLibraryFragment>::@setter::vIncDouble
         vDecDouble @122
           reference: <testLibraryFragment>::@topLevelVariable::vDecDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDecDouble
           setter2: <testLibraryFragment>::@setter::vDecDouble
       getters
         get vInt @-1
           reference: <testLibraryFragment>::@getter::vInt
-          enclosingFragment: <testLibraryFragment>
         get vDouble @-1
           reference: <testLibraryFragment>::@getter::vDouble
-          enclosingFragment: <testLibraryFragment>
         get vIncInt @-1
           reference: <testLibraryFragment>::@getter::vIncInt
-          enclosingFragment: <testLibraryFragment>
         get vDecInt @-1
           reference: <testLibraryFragment>::@getter::vDecInt
-          enclosingFragment: <testLibraryFragment>
         get vIncDouble @-1
           reference: <testLibraryFragment>::@getter::vIncDouble
-          enclosingFragment: <testLibraryFragment>
         get vDecDouble @-1
           reference: <testLibraryFragment>::@getter::vDecDouble
-          enclosingFragment: <testLibraryFragment>
       setters
         set vInt= @-1
           reference: <testLibraryFragment>::@setter::vInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vInt @-1
         set vDouble= @-1
           reference: <testLibraryFragment>::@setter::vDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDouble @-1
         set vIncInt= @-1
           reference: <testLibraryFragment>::@setter::vIncInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIncInt @-1
         set vDecInt= @-1
           reference: <testLibraryFragment>::@setter::vDecInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDecInt @-1
         set vIncDouble= @-1
           reference: <testLibraryFragment>::@setter::vIncDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIncDouble @-1
         set vDecDouble= @-1
           reference: <testLibraryFragment>::@setter::vDecDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDecDouble @-1
   topLevelVariables
     vInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInt
       getter: <none>
       setter: <none>
     vDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<double>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDouble
       getter: <none>
       setter: <none>
     vIncInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIncInt
       getter: <none>
       setter: <none>
     vDecInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDecInt
       getter: <none>
       setter: <none>
     vIncDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIncDouble
       getter: <none>
       setter: <none>
     vDecDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDecDouble
       getter: <none>
@@ -11056,32 +9988,25 @@
   getters
     synthetic static get vInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInt
     synthetic static get vDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDouble
     synthetic static get vIncInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIncInt
     synthetic static get vDecInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDecInt
     synthetic static get vIncDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIncDouble
     synthetic static get vDecDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDecDouble
   setters
     synthetic static set vInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vInt
           reference: <none>
@@ -11089,7 +10014,6 @@
       firstFragment: <testLibraryFragment>::@setter::vInt
     synthetic static set vDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDouble
           reference: <none>
@@ -11097,7 +10021,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDouble
     synthetic static set vIncInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIncInt
           reference: <none>
@@ -11105,7 +10028,6 @@
       firstFragment: <testLibraryFragment>::@setter::vIncInt
     synthetic static set vDecInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDecInt
           reference: <none>
@@ -11113,7 +10035,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDecInt
     synthetic static set vIncDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIncDouble
           reference: <none>
@@ -11121,7 +10042,6 @@
       firstFragment: <testLibraryFragment>::@setter::vIncDouble
     synthetic static set vDecDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDecDouble
           reference: <none>
@@ -11252,123 +10172,99 @@
       topLevelVariables
         vInt @4
           reference: <testLibraryFragment>::@topLevelVariable::vInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInt
           setter2: <testLibraryFragment>::@setter::vInt
         vDouble @18
           reference: <testLibraryFragment>::@topLevelVariable::vDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDouble
           setter2: <testLibraryFragment>::@setter::vDouble
         vIncInt @37
           reference: <testLibraryFragment>::@topLevelVariable::vIncInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIncInt
           setter2: <testLibraryFragment>::@setter::vIncInt
         vDecInt @59
           reference: <testLibraryFragment>::@topLevelVariable::vDecInt::@def::0
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDecInt::@def::0
           setter2: <testLibraryFragment>::@setter::vDecInt::@def::0
         vIncDouble @81
           reference: <testLibraryFragment>::@topLevelVariable::vIncDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIncDouble
           setter2: <testLibraryFragment>::@setter::vIncDouble
         vDecInt @109
           reference: <testLibraryFragment>::@topLevelVariable::vDecInt::@def::1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDecInt::@def::1
           setter2: <testLibraryFragment>::@setter::vDecInt::@def::1
       getters
         get vInt @-1
           reference: <testLibraryFragment>::@getter::vInt
-          enclosingFragment: <testLibraryFragment>
         get vDouble @-1
           reference: <testLibraryFragment>::@getter::vDouble
-          enclosingFragment: <testLibraryFragment>
         get vIncInt @-1
           reference: <testLibraryFragment>::@getter::vIncInt
-          enclosingFragment: <testLibraryFragment>
         get vDecInt @-1
           reference: <testLibraryFragment>::@getter::vDecInt::@def::0
-          enclosingFragment: <testLibraryFragment>
         get vIncDouble @-1
           reference: <testLibraryFragment>::@getter::vIncDouble
-          enclosingFragment: <testLibraryFragment>
         get vDecInt @-1
           reference: <testLibraryFragment>::@getter::vDecInt::@def::1
-          enclosingFragment: <testLibraryFragment>
       setters
         set vInt= @-1
           reference: <testLibraryFragment>::@setter::vInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vInt @-1
         set vDouble= @-1
           reference: <testLibraryFragment>::@setter::vDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDouble @-1
         set vIncInt= @-1
           reference: <testLibraryFragment>::@setter::vIncInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIncInt @-1
         set vDecInt= @-1
           reference: <testLibraryFragment>::@setter::vDecInt::@def::0
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDecInt @-1
         set vIncDouble= @-1
           reference: <testLibraryFragment>::@setter::vIncDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIncDouble @-1
         set vDecInt= @-1
           reference: <testLibraryFragment>::@setter::vDecInt::@def::1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDecInt @-1
   topLevelVariables
     vInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInt
       getter: <none>
       setter: <none>
     vDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDouble
       getter: <none>
       setter: <none>
     vIncInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIncInt
       getter: <none>
       setter: <none>
     vDecInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDecInt::@def::0
       getter: <none>
       setter: <none>
     vIncDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIncDouble
       getter: <none>
       setter: <none>
     vDecInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDecInt::@def::1
       getter: <none>
@@ -11376,32 +10272,25 @@
   getters
     synthetic static get vInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInt
     synthetic static get vDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDouble
     synthetic static get vIncInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIncInt
     synthetic static get vDecInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDecInt::@def::0
     synthetic static get vIncDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIncDouble
     synthetic static get vDecInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDecInt::@def::1
   setters
     synthetic static set vInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vInt
           reference: <none>
@@ -11409,7 +10298,6 @@
       firstFragment: <testLibraryFragment>::@setter::vInt
     synthetic static set vDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDouble
           reference: <none>
@@ -11417,7 +10305,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDouble
     synthetic static set vIncInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIncInt
           reference: <none>
@@ -11425,7 +10312,6 @@
       firstFragment: <testLibraryFragment>::@setter::vIncInt
     synthetic static set vDecInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDecInt
           reference: <none>
@@ -11433,7 +10319,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDecInt::@def::0
     synthetic static set vIncDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIncDouble
           reference: <none>
@@ -11441,7 +10326,6 @@
       firstFragment: <testLibraryFragment>::@setter::vIncDouble
     synthetic static set vDecInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDecInt
           reference: <none>
@@ -11590,123 +10474,99 @@
       topLevelVariables
         vInt @4
           reference: <testLibraryFragment>::@topLevelVariable::vInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vInt
           setter2: <testLibraryFragment>::@setter::vInt
         vDouble @20
           reference: <testLibraryFragment>::@topLevelVariable::vDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDouble
           setter2: <testLibraryFragment>::@setter::vDouble
         vIncInt @41
           reference: <testLibraryFragment>::@topLevelVariable::vIncInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIncInt
           setter2: <testLibraryFragment>::@setter::vIncInt
         vDecInt @66
           reference: <testLibraryFragment>::@topLevelVariable::vDecInt::@def::0
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDecInt::@def::0
           setter2: <testLibraryFragment>::@setter::vDecInt::@def::0
         vIncDouble @91
           reference: <testLibraryFragment>::@topLevelVariable::vIncDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vIncDouble
           setter2: <testLibraryFragment>::@setter::vIncDouble
         vDecInt @122
           reference: <testLibraryFragment>::@topLevelVariable::vDecInt::@def::1
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vDecInt::@def::1
           setter2: <testLibraryFragment>::@setter::vDecInt::@def::1
       getters
         get vInt @-1
           reference: <testLibraryFragment>::@getter::vInt
-          enclosingFragment: <testLibraryFragment>
         get vDouble @-1
           reference: <testLibraryFragment>::@getter::vDouble
-          enclosingFragment: <testLibraryFragment>
         get vIncInt @-1
           reference: <testLibraryFragment>::@getter::vIncInt
-          enclosingFragment: <testLibraryFragment>
         get vDecInt @-1
           reference: <testLibraryFragment>::@getter::vDecInt::@def::0
-          enclosingFragment: <testLibraryFragment>
         get vIncDouble @-1
           reference: <testLibraryFragment>::@getter::vIncDouble
-          enclosingFragment: <testLibraryFragment>
         get vDecInt @-1
           reference: <testLibraryFragment>::@getter::vDecInt::@def::1
-          enclosingFragment: <testLibraryFragment>
       setters
         set vInt= @-1
           reference: <testLibraryFragment>::@setter::vInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vInt @-1
         set vDouble= @-1
           reference: <testLibraryFragment>::@setter::vDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDouble @-1
         set vIncInt= @-1
           reference: <testLibraryFragment>::@setter::vIncInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIncInt @-1
         set vDecInt= @-1
           reference: <testLibraryFragment>::@setter::vDecInt::@def::0
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDecInt @-1
         set vIncDouble= @-1
           reference: <testLibraryFragment>::@setter::vIncDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vIncDouble @-1
         set vDecInt= @-1
           reference: <testLibraryFragment>::@setter::vDecInt::@def::1
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vDecInt @-1
   topLevelVariables
     vInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<int>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vInt
       getter: <none>
       setter: <none>
     vDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: List<double>
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDouble
       getter: <none>
       setter: <none>
     vIncInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIncInt
       getter: <none>
       setter: <none>
     vDecInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDecInt::@def::0
       getter: <none>
       setter: <none>
     vIncDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vIncDouble
       getter: <none>
       setter: <none>
     vDecInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vDecInt::@def::1
       getter: <none>
@@ -11714,32 +10574,25 @@
   getters
     synthetic static get vInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vInt
     synthetic static get vDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDouble
     synthetic static get vIncInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIncInt
     synthetic static get vDecInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDecInt::@def::0
     synthetic static get vIncDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vIncDouble
     synthetic static get vDecInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vDecInt::@def::1
   setters
     synthetic static set vInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vInt
           reference: <none>
@@ -11747,7 +10600,6 @@
       firstFragment: <testLibraryFragment>::@setter::vInt
     synthetic static set vDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDouble
           reference: <none>
@@ -11755,7 +10607,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDouble
     synthetic static set vIncInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIncInt
           reference: <none>
@@ -11763,7 +10614,6 @@
       firstFragment: <testLibraryFragment>::@setter::vIncInt
     synthetic static set vDecInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDecInt
           reference: <none>
@@ -11771,7 +10621,6 @@
       firstFragment: <testLibraryFragment>::@setter::vDecInt::@def::0
     synthetic static set vIncDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vIncDouble
           reference: <none>
@@ -11779,7 +10628,6 @@
       firstFragment: <testLibraryFragment>::@setter::vIncDouble
     synthetic static set vDecInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vDecInt
           reference: <none>
@@ -11825,23 +10673,19 @@
       topLevelVariables
         vNot @4
           reference: <testLibraryFragment>::@topLevelVariable::vNot
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNot
           setter2: <testLibraryFragment>::@setter::vNot
       getters
         get vNot @-1
           reference: <testLibraryFragment>::@getter::vNot
-          enclosingFragment: <testLibraryFragment>
       setters
         set vNot= @-1
           reference: <testLibraryFragment>::@setter::vNot
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNot @-1
   topLevelVariables
     vNot
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNot
       getter: <none>
@@ -11849,12 +10693,10 @@
   getters
     synthetic static get vNot
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNot
   setters
     synthetic static set vNot=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNot
           reference: <none>
@@ -11934,63 +10776,51 @@
       topLevelVariables
         vNegateInt @4
           reference: <testLibraryFragment>::@topLevelVariable::vNegateInt
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNegateInt
           setter2: <testLibraryFragment>::@setter::vNegateInt
         vNegateDouble @25
           reference: <testLibraryFragment>::@topLevelVariable::vNegateDouble
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vNegateDouble
           setter2: <testLibraryFragment>::@setter::vNegateDouble
         vComplement @51
           reference: <testLibraryFragment>::@topLevelVariable::vComplement
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vComplement
           setter2: <testLibraryFragment>::@setter::vComplement
       getters
         get vNegateInt @-1
           reference: <testLibraryFragment>::@getter::vNegateInt
-          enclosingFragment: <testLibraryFragment>
         get vNegateDouble @-1
           reference: <testLibraryFragment>::@getter::vNegateDouble
-          enclosingFragment: <testLibraryFragment>
         get vComplement @-1
           reference: <testLibraryFragment>::@getter::vComplement
-          enclosingFragment: <testLibraryFragment>
       setters
         set vNegateInt= @-1
           reference: <testLibraryFragment>::@setter::vNegateInt
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNegateInt @-1
         set vNegateDouble= @-1
           reference: <testLibraryFragment>::@setter::vNegateDouble
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vNegateDouble @-1
         set vComplement= @-1
           reference: <testLibraryFragment>::@setter::vComplement
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vComplement @-1
   topLevelVariables
     vNegateInt
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNegateInt
       getter: <none>
       setter: <none>
     vNegateDouble
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: double
       firstFragment: <testLibraryFragment>::@topLevelVariable::vNegateDouble
       getter: <none>
       setter: <none>
     vComplement
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::vComplement
       getter: <none>
@@ -11998,20 +10828,16 @@
   getters
     synthetic static get vNegateInt
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNegateInt
     synthetic static get vNegateDouble
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vNegateDouble
     synthetic static get vComplement
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vComplement
   setters
     synthetic static set vNegateInt=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNegateInt
           reference: <none>
@@ -12019,7 +10845,6 @@
       firstFragment: <testLibraryFragment>::@setter::vNegateInt
     synthetic static set vNegateDouble=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vNegateDouble
           reference: <none>
@@ -12027,7 +10852,6 @@
       firstFragment: <testLibraryFragment>::@setter::vNegateDouble
     synthetic static set vComplement=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vComplement
           reference: <none>
@@ -12124,21 +10948,17 @@
           fields
             d @21
               reference: <testLibraryFragment>::@class::C::@field::d
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::d
               setter2: <testLibraryFragment>::@class::C::@setter::d
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get d @-1
               reference: <testLibraryFragment>::@class::C::@getter::d
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set d= @-1
               reference: <testLibraryFragment>::@class::C::@setter::d
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _d @-1
         class D @32
@@ -12146,41 +10966,33 @@
           fields
             i @42
               reference: <testLibraryFragment>::@class::D::@field::i
-              enclosingFragment: <testLibraryFragment>::@class::D
               getter2: <testLibraryFragment>::@class::D::@getter::i
               setter2: <testLibraryFragment>::@class::D::@setter::i
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           getters
             get i @-1
               reference: <testLibraryFragment>::@class::D::@getter::i
-              enclosingFragment: <testLibraryFragment>::@class::D
           setters
             set i= @-1
               reference: <testLibraryFragment>::@class::D::@setter::i
-              enclosingFragment: <testLibraryFragment>::@class::D
               parameters
                 _i @-1
       topLevelVariables
         final x @53
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         static d
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: D
           firstFragment: <testLibraryFragment>::@class::C::@field::d
           getter: <none>
@@ -12192,12 +11004,10 @@
       getters
         synthetic static get d
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::d
       setters
         synthetic static set d=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _d
               reference: <none>
@@ -12205,12 +11015,10 @@
           firstFragment: <testLibraryFragment>::@class::C::@setter::d
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       fields
         i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: int
           firstFragment: <testLibraryFragment>::@class::D::@field::i
           getter: <none>
@@ -12222,12 +11030,10 @@
       getters
         synthetic get i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           firstFragment: <testLibraryFragment>::@class::D::@getter::i
       setters
         synthetic set i=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           parameters
             requiredPositional _i
               reference: <none>
@@ -12236,14 +11042,12 @@
   topLevelVariables
     final x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
 ''');
   }
@@ -12336,63 +11140,51 @@
           fields
             d @-1
               reference: <testLibraryFragment>::@class::C::@field::d
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::d
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get d @25
               reference: <testLibraryFragment>::@class::C::@getter::d
-              enclosingFragment: <testLibraryFragment>::@class::C
         class D @44
           reference: <testLibraryFragment>::@class::D
           fields
             i @54
               reference: <testLibraryFragment>::@class::D::@field::i
-              enclosingFragment: <testLibraryFragment>::@class::D
               getter2: <testLibraryFragment>::@class::D::@getter::i
               setter2: <testLibraryFragment>::@class::D::@setter::i
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::D::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::D
           getters
             get i @-1
               reference: <testLibraryFragment>::@class::D::@getter::i
-              enclosingFragment: <testLibraryFragment>::@class::D
           setters
             set i= @-1
               reference: <testLibraryFragment>::@class::D::@setter::i
-              enclosingFragment: <testLibraryFragment>::@class::D
               parameters
                 _i @-1
       topLevelVariables
         x @63
           reference: <testLibraryFragment>::@topLevelVariable::x
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::x
           setter2: <testLibraryFragment>::@setter::x
       getters
         get x @-1
           reference: <testLibraryFragment>::@getter::x
-          enclosingFragment: <testLibraryFragment>
       setters
         set x= @-1
           reference: <testLibraryFragment>::@setter::x
-          enclosingFragment: <testLibraryFragment>
           parameters
             _x @-1
   classes
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic static d
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: D
           firstFragment: <testLibraryFragment>::@class::C::@field::d
           getter: <none>
@@ -12403,16 +11195,13 @@
       getters
         static get d
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::d
     class D
       reference: <testLibraryFragment>::@class::D
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::D
       fields
         i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           type: int
           firstFragment: <testLibraryFragment>::@class::D::@field::i
           getter: <none>
@@ -12424,12 +11213,10 @@
       getters
         synthetic get i
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           firstFragment: <testLibraryFragment>::@class::D::@getter::i
       setters
         synthetic set i=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::D
           parameters
             requiredPositional _i
               reference: <none>
@@ -12438,7 +11225,6 @@
   topLevelVariables
     x
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: int
       firstFragment: <testLibraryFragment>::@topLevelVariable::x
       getter: <none>
@@ -12446,12 +11232,10 @@
   getters
     synthetic static get x
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::x
   setters
     synthetic static set x=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _x
           reference: <none>
@@ -12548,83 +11332,67 @@
       topLevelVariables
         vLess @4
           reference: <testLibraryFragment>::@topLevelVariable::vLess
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vLess
           setter2: <testLibraryFragment>::@setter::vLess
         vLessOrEqual @23
           reference: <testLibraryFragment>::@topLevelVariable::vLessOrEqual
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vLessOrEqual
           setter2: <testLibraryFragment>::@setter::vLessOrEqual
         vGreater @50
           reference: <testLibraryFragment>::@topLevelVariable::vGreater
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vGreater
           setter2: <testLibraryFragment>::@setter::vGreater
         vGreaterOrEqual @72
           reference: <testLibraryFragment>::@topLevelVariable::vGreaterOrEqual
-          enclosingFragment: <testLibraryFragment>
           getter2: <testLibraryFragment>::@getter::vGreaterOrEqual
           setter2: <testLibraryFragment>::@setter::vGreaterOrEqual
       getters
         get vLess @-1
           reference: <testLibraryFragment>::@getter::vLess
-          enclosingFragment: <testLibraryFragment>
         get vLessOrEqual @-1
           reference: <testLibraryFragment>::@getter::vLessOrEqual
-          enclosingFragment: <testLibraryFragment>
         get vGreater @-1
           reference: <testLibraryFragment>::@getter::vGreater
-          enclosingFragment: <testLibraryFragment>
         get vGreaterOrEqual @-1
           reference: <testLibraryFragment>::@getter::vGreaterOrEqual
-          enclosingFragment: <testLibraryFragment>
       setters
         set vLess= @-1
           reference: <testLibraryFragment>::@setter::vLess
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vLess @-1
         set vLessOrEqual= @-1
           reference: <testLibraryFragment>::@setter::vLessOrEqual
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vLessOrEqual @-1
         set vGreater= @-1
           reference: <testLibraryFragment>::@setter::vGreater
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vGreater @-1
         set vGreaterOrEqual= @-1
           reference: <testLibraryFragment>::@setter::vGreaterOrEqual
-          enclosingFragment: <testLibraryFragment>
           parameters
             _vGreaterOrEqual @-1
   topLevelVariables
     vLess
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vLess
       getter: <none>
       setter: <none>
     vLessOrEqual
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vLessOrEqual
       getter: <none>
       setter: <none>
     vGreater
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vGreater
       getter: <none>
       setter: <none>
     vGreaterOrEqual
       reference: <none>
-      enclosingElement2: <testLibrary>
       type: bool
       firstFragment: <testLibraryFragment>::@topLevelVariable::vGreaterOrEqual
       getter: <none>
@@ -12632,24 +11400,19 @@
   getters
     synthetic static get vLess
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vLess
     synthetic static get vLessOrEqual
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vLessOrEqual
     synthetic static get vGreater
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vGreater
     synthetic static get vGreaterOrEqual
       reference: <none>
-      enclosingElement: <testLibrary>
       firstFragment: <testLibraryFragment>::@getter::vGreaterOrEqual
   setters
     synthetic static set vLess=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vLess
           reference: <none>
@@ -12657,7 +11420,6 @@
       firstFragment: <testLibraryFragment>::@setter::vLess
     synthetic static set vLessOrEqual=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vLessOrEqual
           reference: <none>
@@ -12665,7 +11427,6 @@
       firstFragment: <testLibraryFragment>::@setter::vLessOrEqual
     synthetic static set vGreater=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vGreater
           reference: <none>
@@ -12673,7 +11434,6 @@
       firstFragment: <testLibraryFragment>::@setter::vGreater
     synthetic static set vGreaterOrEqual=
       reference: <none>
-      enclosingElement: <testLibrary>
       parameters
         requiredPositional _vGreaterOrEqual
           reference: <none>
@@ -12763,21 +11523,17 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
               setter2: <testLibraryFragment>::@class::A::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _x @-1
         class B @36
@@ -12785,25 +11541,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @59
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -12815,12 +11566,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _x
               reference: <none>
@@ -12828,12 +11577,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           setter: <none>
@@ -12844,7 +11591,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
 ''');
   }
@@ -12907,32 +11653,26 @@
           fields
             f @16
               reference: <testLibraryFragment>::@class::A::@field::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::f
               setter2: <testLibraryFragment>::@class::A::@setter::f
           constructors
             new @25
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get f @-1
               reference: <testLibraryFragment>::@class::A::@getter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set f= @-1
               reference: <testLibraryFragment>::@class::A::@setter::f
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _f @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::f
           getter: <none>
@@ -12948,12 +11688,10 @@
       getters
         synthetic get f
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::f
       setters
         synthetic set f=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _f
               reference: <none>
@@ -13093,47 +11831,37 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
               setter2: <testLibraryFragment>::@class::A::@setter::x
             y @34
               reference: <testLibraryFragment>::@class::A::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::y
               setter2: <testLibraryFragment>::@class::A::@setter::y
             z @43
               reference: <testLibraryFragment>::@class::A::@field::z
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::z
               setter2: <testLibraryFragment>::@class::A::@setter::z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
             get y @-1
               reference: <testLibraryFragment>::@class::A::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::A
             get z @-1
               reference: <testLibraryFragment>::@class::A::@getter::z
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _x @-1
             set y= @-1
               reference: <testLibraryFragment>::@class::A::@setter::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _y @-1
             set z= @-1
               reference: <testLibraryFragment>::@class::A::@setter::z
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _z @-1
         class B @54
@@ -13141,62 +11869,50 @@
           fields
             x @77
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
               setter2: <testLibraryFragment>::@class::B::@setter::x
             y @-1
               reference: <testLibraryFragment>::@class::B::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::y
             z @-1
               reference: <testLibraryFragment>::@class::B::@field::z
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
             get y @86
               reference: <testLibraryFragment>::@class::B::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _x @-1
             set z= @103
               reference: <testLibraryFragment>::@class::B::@setter::z
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @105
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
           setter: <none>
         y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::y
           getter: <none>
           setter: <none>
         z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::z
           getter: <none>
@@ -13208,20 +11924,16 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
         synthetic get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::y
         synthetic get z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::z
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _x
               reference: <none>
@@ -13229,7 +11941,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
         synthetic set y=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _y
               reference: <none>
@@ -13237,7 +11948,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::y
         synthetic set z=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _z
               reference: <none>
@@ -13245,25 +11955,21 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::z
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
           setter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::y
           getter: <none>
         synthetic z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::z
           setter: <none>
@@ -13274,16 +11980,13 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
         get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::y
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _x
               reference: <none>
@@ -13291,7 +11994,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
         set z=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -13379,21 +12081,17 @@
           fields
             x @29
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
               setter2: <testLibraryFragment>::@class::A::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _x @-1
         class B @40
@@ -13401,32 +12099,26 @@
           fields
             x @63
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _x @-1
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -13438,12 +12130,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _x
               reference: <none>
@@ -13451,12 +12141,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
@@ -13468,12 +12156,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _x
               reference: <none>
@@ -13621,47 +12307,37 @@
           fields
             x @26
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
               setter2: <testLibraryFragment>::@class::A::@setter::x
             y @33
               reference: <testLibraryFragment>::@class::A::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::y
               setter2: <testLibraryFragment>::@class::A::@setter::y
             z @40
               reference: <testLibraryFragment>::@class::A::@field::z
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::z
               setter2: <testLibraryFragment>::@class::A::@setter::z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
             get y @-1
               reference: <testLibraryFragment>::@class::A::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::A
             get z @-1
               reference: <testLibraryFragment>::@class::A::@getter::z
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _x @-1
             set y= @-1
               reference: <testLibraryFragment>::@class::A::@setter::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _y @-1
             set z= @-1
               reference: <testLibraryFragment>::@class::A::@setter::z
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _z @-1
         class B @51
@@ -13671,64 +12347,52 @@
           fields
             x @80
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
               setter2: <testLibraryFragment>::@class::B::@setter::x
             y @-1
               reference: <testLibraryFragment>::@class::B::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::y
             z @-1
               reference: <testLibraryFragment>::@class::B::@field::z
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
             get y @89
               reference: <testLibraryFragment>::@class::B::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _x @-1
             set z= @106
               reference: <testLibraryFragment>::@class::B::@setter::z
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @108
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibraryFragment>::@class::A
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: E
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
           setter: <none>
         y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: E
           firstFragment: <testLibraryFragment>::@class::A::@field::y
           getter: <none>
           setter: <none>
         z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: E
           firstFragment: <testLibraryFragment>::@class::A::@field::z
           getter: <none>
@@ -13740,20 +12404,16 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
         synthetic get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::y
         synthetic get z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::z
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _x
               reference: <none>
@@ -13761,7 +12421,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
         synthetic set y=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _y
               reference: <none>
@@ -13769,7 +12428,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::y
         synthetic set z=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _z
               reference: <none>
@@ -13777,27 +12435,23 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::z
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: T
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
           setter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: T
           firstFragment: <testLibraryFragment>::@class::B::@field::y
           getter: <none>
         synthetic z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: T
           firstFragment: <testLibraryFragment>::@class::B::@field::z
           setter: <none>
@@ -13808,16 +12462,13 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
         get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::y
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _x
               reference: <none>
@@ -13825,7 +12476,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
         set z=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -13913,21 +12563,17 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
               setter2: <testLibraryFragment>::@class::A::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _x @-1
         class B @36
@@ -13935,32 +12581,26 @@
           fields
             x @59
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _x @-1
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -13972,12 +12612,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _x
               reference: <none>
@@ -13985,12 +12623,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
@@ -14002,12 +12638,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _x
               reference: <none>
@@ -14095,21 +12729,17 @@
           fields
             x @25
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
               setter2: <testLibraryFragment>::@class::A::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _x @-1
         class B @36
@@ -14117,32 +12747,26 @@
           fields
             x @59
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _x @-1
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: num
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -14154,12 +12778,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _x
               reference: <none>
@@ -14167,12 +12789,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: num
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
@@ -14184,12 +12804,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _x
               reference: <none>
@@ -14308,89 +12926,70 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
             y @-1
               reference: <testLibraryFragment>::@class::A::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::y
             z @-1
               reference: <testLibraryFragment>::@class::A::@field::z
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
             get y @42
               reference: <testLibraryFragment>::@class::A::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::A
             get z @55
               reference: <testLibraryFragment>::@class::A::@getter::z
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @66
           reference: <testLibraryFragment>::@class::B
           fields
             x @89
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
               setter2: <testLibraryFragment>::@class::B::@setter::x
             y @-1
               reference: <testLibraryFragment>::@class::B::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::y
             z @-1
               reference: <testLibraryFragment>::@class::B::@field::z
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
             get y @98
               reference: <testLibraryFragment>::@class::B::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _x @-1
             set z= @115
               reference: <testLibraryFragment>::@class::B::@setter::z
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @117
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::y
           getter: <none>
         synthetic z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::z
           getter: <none>
@@ -14401,37 +13000,30 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
         abstract get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::y
         abstract get z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::z
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
           setter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::y
           getter: <none>
         synthetic z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::z
           setter: <none>
@@ -14442,16 +13034,13 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
         get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::y
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _x
               reference: <none>
@@ -14459,7 +13048,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
         set z=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -14586,30 +13174,23 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
             y @-1
               reference: <testLibraryFragment>::@class::A::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::y
             z @-1
               reference: <testLibraryFragment>::@class::A::@field::z
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @30
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
             get y @41
               reference: <testLibraryFragment>::@class::A::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::A
             get z @52
               reference: <testLibraryFragment>::@class::A::@getter::z
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @63
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -14617,62 +13198,50 @@
           fields
             x @92
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
               setter2: <testLibraryFragment>::@class::B::@setter::x
             y @-1
               reference: <testLibraryFragment>::@class::B::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::y
             z @-1
               reference: <testLibraryFragment>::@class::B::@field::z
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
             get y @101
               reference: <testLibraryFragment>::@class::B::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _x @-1
             set z= @118
               reference: <testLibraryFragment>::@class::B::@setter::z
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @120
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: E
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: E
           firstFragment: <testLibraryFragment>::@class::A::@field::y
           getter: <none>
         synthetic z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: E
           firstFragment: <testLibraryFragment>::@class::A::@field::z
           getter: <none>
@@ -14683,39 +13252,32 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
         abstract get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::y
         abstract get z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::z
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: T
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
           setter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: T
           firstFragment: <testLibraryFragment>::@class::B::@field::y
           getter: <none>
         synthetic z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: T
           firstFragment: <testLibraryFragment>::@class::B::@field::z
           setter: <none>
@@ -14726,16 +13288,13 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
         get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::y
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _x
               reference: <none>
@@ -14743,7 +13302,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
         set z=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -14838,55 +13396,44 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @49
           reference: <testLibraryFragment>::@class::B
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @66
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @77
           reference: <testLibraryFragment>::@class::C
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @103
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -14897,16 +13444,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: String
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
@@ -14917,16 +13461,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -14937,7 +13478,6 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -15028,55 +13568,44 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @49
           reference: <testLibraryFragment>::@class::B
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @67
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @78
           reference: <testLibraryFragment>::@class::C
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @104
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -15087,16 +13616,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
@@ -15107,16 +13633,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -15127,7 +13650,6 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -15226,16 +13748,13 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @30
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @50
           reference: <testLibraryFragment>::@class::B
           typeParameters
@@ -15243,42 +13762,34 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @65
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @76
           reference: <testLibraryFragment>::@class::C
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @115
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: T
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -15289,18 +13800,15 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: T
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
@@ -15311,16 +13819,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -15331,7 +13836,6 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -15421,55 +13925,44 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @49
           reference: <testLibraryFragment>::@class::B
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @63
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @74
           reference: <testLibraryFragment>::@class::C
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @100
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -15480,16 +13973,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
@@ -15500,16 +13990,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -15520,7 +14007,6 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -15650,47 +14136,37 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
             y @-1
               reference: <testLibraryFragment>::@class::A::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::y
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
             get y @42
               reference: <testLibraryFragment>::@class::A::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @62
           reference: <testLibraryFragment>::@class::B
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::x
             y @-1
               reference: <testLibraryFragment>::@class::B::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::y
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @77
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @86
             set y= @101
               reference: <testLibraryFragment>::@class::B::@setter::y
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @110
         class C @122
@@ -15698,45 +14174,36 @@
           fields
             x @148
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
             y @159
               reference: <testLibraryFragment>::@class::C::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::y
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
             get y @-1
               reference: <testLibraryFragment>::@class::C::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::y
           getter: <none>
@@ -15747,26 +14214,21 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
         abstract get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::y
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: String
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           setter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: String
           firstFragment: <testLibraryFragment>::@class::B::@field::y
           setter: <none>
@@ -15777,7 +14239,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -15785,7 +14246,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
         abstract set y=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -15793,19 +14253,16 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::y
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
           setter: <none>
         final y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::y
           getter: <none>
@@ -15816,16 +14273,13 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
         synthetic get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::y
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -15922,31 +14376,25 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @49
           reference: <testLibraryFragment>::@class::B
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @64
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @73
         class C @85
@@ -15954,25 +14402,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @111
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -15983,16 +14426,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: String
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           setter: <none>
@@ -16003,7 +14443,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -16011,12 +14450,10 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -16027,7 +14464,6 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -16124,31 +14560,25 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @49
           reference: <testLibraryFragment>::@class::B
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @64
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @73
         class C @85
@@ -16156,27 +14586,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @111
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _ @113
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -16187,16 +14612,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: String
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           setter: <none>
@@ -16207,7 +14629,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -16215,12 +14636,10 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: String
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -16231,7 +14650,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _
               reference: <none>
@@ -16335,31 +14753,25 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @49
           reference: <testLibraryFragment>::@class::B
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @64
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @70
         class C @82
@@ -16367,32 +14779,26 @@
           fields
             x @108
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _x @-1
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -16403,16 +14809,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           setter: <none>
@@ -16423,7 +14826,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -16431,12 +14833,10 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -16448,12 +14848,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _x
               reference: <none>
@@ -16550,31 +14948,25 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @49
           reference: <testLibraryFragment>::@class::B
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @64
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @70
         class C @82
@@ -16582,25 +14974,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @108
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -16611,16 +14998,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           setter: <none>
@@ -16631,7 +15015,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -16639,12 +15022,10 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -16655,7 +15036,6 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -16751,31 +15131,25 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @49
           reference: <testLibraryFragment>::@class::B
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @64
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @70
         class C @82
@@ -16783,27 +15157,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               setter2: <testLibraryFragment>::@class::C::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           setters
             set x= @108
               reference: <testLibraryFragment>::@class::C::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 _ @110
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -16814,16 +15183,13 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           setter: <none>
@@ -16834,7 +15200,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -16842,12 +15207,10 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           setter: <none>
@@ -16858,7 +15221,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           parameters
             requiredPositional _
               reference: <none>
@@ -16986,34 +15348,27 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::x
             y @-1
               reference: <testLibraryFragment>::@class::A::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::y
             z @-1
               reference: <testLibraryFragment>::@class::A::@field::z
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @30
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @36
             set y= @51
               reference: <testLibraryFragment>::@class::A::@setter::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @57
             set z= @72
               reference: <testLibraryFragment>::@class::A::@setter::z
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @78
         class B @90
@@ -17021,60 +15376,48 @@
           fields
             x @113
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
               setter2: <testLibraryFragment>::@class::B::@setter::x
             y @-1
               reference: <testLibraryFragment>::@class::B::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::y
             z @-1
               reference: <testLibraryFragment>::@class::B::@field::z
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::z
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
             get y @122
               reference: <testLibraryFragment>::@class::B::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _x @-1
             set z= @139
               reference: <testLibraryFragment>::@class::B::@setter::z
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @141
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           setter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::y
           setter: <none>
         synthetic z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::z
           setter: <none>
@@ -17085,7 +15428,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -17093,7 +15435,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
         abstract set y=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -17101,7 +15442,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::y
         abstract set z=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -17109,25 +15449,21 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::z
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
           setter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::y
           getter: <none>
         synthetic z
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::z
           setter: <none>
@@ -17138,16 +15474,13 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
         get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::y
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _x
               reference: <none>
@@ -17155,7 +15488,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
         set z=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -17255,16 +15587,13 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @30
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @36
         class B @57
@@ -17272,16 +15601,13 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @72
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @81
         class C @93
@@ -17289,25 +15615,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @119
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           setter: <none>
@@ -17318,7 +15639,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -17326,12 +15646,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: String
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           setter: <none>
@@ -17342,7 +15660,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -17350,12 +15667,10 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -17366,7 +15681,6 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -17462,16 +15776,13 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               setter2: <testLibraryFragment>::@class::A::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @30
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @36
         class B @57
@@ -17479,16 +15790,13 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @72
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @78
         class C @90
@@ -17496,25 +15804,20 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::C::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::C
               getter2: <testLibraryFragment>::@class::C::@getter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           getters
             get x @116
               reference: <testLibraryFragment>::@class::C::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           setter: <none>
@@ -17525,7 +15828,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _
               reference: <none>
@@ -17533,12 +15835,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           setter: <none>
@@ -17549,7 +15849,6 @@
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional _
               reference: <none>
@@ -17557,12 +15856,10 @@
           firstFragment: <testLibraryFragment>::@class::B::@setter::x
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           type: int
           firstFragment: <testLibraryFragment>::@class::C::@field::x
           getter: <none>
@@ -17573,7 +15870,6 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::C
           firstFragment: <testLibraryFragment>::@class::C::@getter::x
 ''');
   }
@@ -17691,59 +15987,47 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
             y @-1
               reference: <testLibraryFragment>::@class::A::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::y
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @41
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
             get y @69
               reference: <testLibraryFragment>::@class::A::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @89
           reference: <testLibraryFragment>::@class::B
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
             y @-1
               reference: <testLibraryFragment>::@class::B::@field::y
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::y
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: int}
           getters
             get x @114
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
             get y @131
               reference: <testLibraryFragment>::@class::B::@getter::y
-              enclosingFragment: <testLibraryFragment>::@class::B
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic Function()
             alias: <testLibraryFragment>::@typeAlias::F
               typeArguments
@@ -17752,7 +16036,6 @@
           getter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: List<dynamic Function()>
           firstFragment: <testLibraryFragment>::@class::A::@field::y
           getter: <none>
@@ -17763,21 +16046,17 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
         get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::y
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A<int>
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: dynamic Function()
             alias: <testLibraryFragment>::@typeAlias::F
               typeArguments
@@ -17786,7 +16065,6 @@
           getter: <none>
         synthetic y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: List<dynamic Function()>
           firstFragment: <testLibraryFragment>::@class::B::@field::y
           getter: <none>
@@ -17798,11 +16076,9 @@
       getters
         get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
         get y
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::y
 ''');
   }
@@ -17886,21 +16162,17 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
               setter2: <testLibraryFragment>::@class::A::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @43
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @59
         class B @71
@@ -17908,32 +16180,26 @@
           fields
             x @94
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               getter2: <testLibraryFragment>::@class::B::@getter::x
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           getters
             get x @-1
               reference: <testLibraryFragment>::@class::B::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @-1
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _x @-1
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: num
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -17945,12 +16211,10 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional covariant _
               reference: <none>
@@ -17958,12 +16222,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           getter: <none>
@@ -17975,12 +16237,10 @@
       getters
         synthetic get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           firstFragment: <testLibraryFragment>::@class::B::@getter::x
       setters
         synthetic set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional covariant _x
               reference: <none>
@@ -18064,21 +16324,17 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::A::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::x
               setter2: <testLibraryFragment>::@class::A::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get x @29
               reference: <testLibraryFragment>::@class::A::@getter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set x= @43
               reference: <testLibraryFragment>::@class::A::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _ @59
         class B @71
@@ -18086,27 +16342,22 @@
           fields
             x @-1
               reference: <testLibraryFragment>::@class::B::@field::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               setter2: <testLibraryFragment>::@class::B::@setter::x
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           setters
             set x= @94
               reference: <testLibraryFragment>::@class::B::@setter::x
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 _ @100
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: num
           firstFragment: <testLibraryFragment>::@class::A::@field::x
           getter: <none>
@@ -18118,12 +16369,10 @@
       getters
         abstract get x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::x
       setters
         abstract set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional covariant _
               reference: <none>
@@ -18131,12 +16380,10 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::x
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       fields
         synthetic x
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           type: int
           firstFragment: <testLibraryFragment>::@class::B::@field::x
           setter: <none>
@@ -18147,7 +16394,6 @@
       setters
         set x=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::B
           parameters
             requiredPositional covariant _
               reference: <none>
@@ -18240,72 +16486,58 @@
           fields
             t1 @16
               reference: <testLibraryFragment>::@class::A::@field::t1
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::t1
               setter2: <testLibraryFragment>::@class::A::@setter::t1
             t2 @30
               reference: <testLibraryFragment>::@class::A::@field::t2
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::t2
               setter2: <testLibraryFragment>::@class::A::@setter::t2
             t3 @46
               reference: <testLibraryFragment>::@class::A::@field::t3
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::t3
               setter2: <testLibraryFragment>::@class::A::@setter::t3
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get t1 @-1
               reference: <testLibraryFragment>::@class::A::@getter::t1
-              enclosingFragment: <testLibraryFragment>::@class::A
             get t2 @-1
               reference: <testLibraryFragment>::@class::A::@getter::t2
-              enclosingFragment: <testLibraryFragment>::@class::A
             get t3 @-1
               reference: <testLibraryFragment>::@class::A::@getter::t3
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set t1= @-1
               reference: <testLibraryFragment>::@class::A::@setter::t1
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _t1 @-1
             set t2= @-1
               reference: <testLibraryFragment>::@class::A::@setter::t2
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _t2 @-1
             set t3= @-1
               reference: <testLibraryFragment>::@class::A::@setter::t3
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _t3 @-1
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         t1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::t1
           getter: <none>
           setter: <none>
         t2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: double
           firstFragment: <testLibraryFragment>::@class::A::@field::t2
           getter: <none>
           setter: <none>
         t3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: dynamic
           firstFragment: <testLibraryFragment>::@class::A::@field::t3
           getter: <none>
@@ -18317,20 +16549,16 @@
       getters
         synthetic get t1
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::t1
         synthetic get t2
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::t2
         synthetic get t3
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::t3
       setters
         synthetic set t1=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _t1
               reference: <none>
@@ -18338,7 +16566,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::t1
         synthetic set t2=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _t2
               reference: <none>
@@ -18346,7 +16573,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::t2
         synthetic set t3=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _t3
               reference: <none>
@@ -18419,11 +16645,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @23
         class B @37
@@ -18431,19 +16655,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @58
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @60
                 b @63
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -18459,7 +16680,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -18562,11 +16782,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @23
         class B @37
@@ -18574,11 +16792,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @48
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @57
         class C @71
@@ -18586,18 +16802,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @100
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @102
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -18613,7 +16826,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -18629,7 +16841,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::m
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A
       constructors
@@ -18730,11 +16941,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @25
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 x @33
         class B @55
@@ -18742,11 +16951,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             foo @68
               reference: <testLibraryFragment>::@class::B::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 x @76
         class C @98
@@ -18754,17 +16961,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             foo @126
               reference: <testLibraryFragment>::@class::C::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 x @130
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -18780,7 +16984,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -18796,7 +16999,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::foo
     abstract class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -18886,36 +17088,29 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @16
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
         class B @31
           reference: <testLibraryFragment>::@class::B
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @44
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
         class C @59
           reference: <testLibraryFragment>::@class::C
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @88
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -18927,7 +17122,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -18939,7 +17133,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::m
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A
       constructors
@@ -19045,11 +17238,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @24
         class B @38
@@ -19059,11 +17250,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @52
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @56
         class C @70
@@ -19071,20 +17260,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {T: int}
           methods
             m @112
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @114
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::A
@@ -19102,7 +17288,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         E
       firstFragment: <testLibraryFragment>::@class::B
@@ -19120,7 +17305,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::m
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A<int>
       constructors
@@ -19233,11 +17417,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @24
         class B @38
@@ -19247,11 +17429,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @49
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @55
         class C @69
@@ -19259,20 +17439,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {K: int, V: String}
           methods
             m @119
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @121
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         K
         V
@@ -19291,7 +17468,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -19309,7 +17485,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::m
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A<int, String>
       constructors
@@ -19391,11 +17566,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @23
         class B @37
@@ -19403,12 +17576,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @53
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @55
                 default b @59
@@ -19416,7 +17587,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -19432,7 +17602,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -19516,11 +17685,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @23
         class B @37
@@ -19528,19 +17695,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @53
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @55
                 default b @59
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -19556,7 +17720,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -19638,11 +17801,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @12
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @14
         class B @28
@@ -19650,18 +17811,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @44
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @46
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -19677,7 +17835,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -19756,11 +17913,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             foo @16
               reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @27
         class B @47
@@ -19768,18 +17923,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @63
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @65
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -19795,7 +17947,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -19884,21 +18035,17 @@
           fields
             m @16
               reference: <testLibraryFragment>::@class::A::@field::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               getter2: <testLibraryFragment>::@class::A::@getter::m
               setter2: <testLibraryFragment>::@class::A::@setter::m
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           getters
             get m @-1
               reference: <testLibraryFragment>::@class::A::@getter::m
-              enclosingFragment: <testLibraryFragment>::@class::A
           setters
             set m= @-1
               reference: <testLibraryFragment>::@class::A::@setter::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 _m @-1
         class B @32
@@ -19906,23 +18053,19 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @48
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @50
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       fields
         m
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           type: int
           firstFragment: <testLibraryFragment>::@class::A::@field::m
           getter: <none>
@@ -19934,12 +18077,10 @@
       getters
         synthetic get m
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           firstFragment: <testLibraryFragment>::@class::A::@getter::m
       setters
         synthetic set m=
           reference: <none>
-          enclosingElement: <testLibraryFragment>::@class::A
           parameters
             requiredPositional _m
               reference: <none>
@@ -19947,7 +18088,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@setter::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -20051,11 +18191,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @24
         class B @38
@@ -20065,7 +18203,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {K: int, V: T}
@@ -20074,20 +18211,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::B::@constructor::new
                 substitution: {T: String}
           methods
             m @94
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @96
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         K
         V
@@ -20106,7 +18240,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -20118,7 +18251,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: B<String>
       constructors
@@ -20217,11 +18349,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @25
         class B @39
@@ -20229,12 +18359,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @55
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @57
         class C @71
@@ -20242,18 +18370,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::B::@constructor::new
           methods
             m @87
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @89
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -20269,7 +18394,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -20287,7 +18411,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::m
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: B
       constructors
@@ -20386,11 +18509,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @25
         class B @39
@@ -20398,11 +18519,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @58
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @60
         class C @74
@@ -20410,18 +18529,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::B::@constructor::new
           methods
             m @90
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @92
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -20437,7 +18553,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -20453,7 +18568,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::m
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: B
       constructors
@@ -20553,11 +18667,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @25
         class B @39
@@ -20565,11 +18677,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @67
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @69
         class C @83
@@ -20577,18 +18687,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::B::@constructor::new
           methods
             m @99
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @101
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -20604,7 +18711,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: Object
       constructors
@@ -20621,7 +18727,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::m
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: B
       constructors
@@ -20714,11 +18819,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @24
                 b @34
@@ -20727,21 +18830,18 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {K: int, V: String}
           methods
             m @77
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @79
                 b @82
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         K
         V
@@ -20763,7 +18863,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A<int, String>
       constructors
@@ -20845,11 +18944,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @25
         class B @39
@@ -20857,18 +18954,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @55
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @57
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -20884,7 +18978,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -20969,11 +19062,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @25
                 default b @36
@@ -20983,12 +19074,10 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @67
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @69
                 default b @73
@@ -20996,7 +19085,6 @@
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -21015,7 +19103,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -21101,11 +19188,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @25
                 default b @36
@@ -21114,19 +19199,16 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @67
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @69
                 default b @73
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -21145,7 +19227,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: A
       constructors
@@ -21252,11 +19333,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @24
         class B @38
@@ -21266,7 +19345,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {K: int, V: T}
@@ -21275,20 +19353,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::B::@constructor::new
                 substitution: {T: String}
           methods
             m @94
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @96
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         K
         V
@@ -21307,7 +19382,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -21319,7 +19393,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: B<String>
       constructors
@@ -21406,11 +19479,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @29
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @33
         class B @45
@@ -21418,17 +19489,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @77
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @79
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         K
         V
@@ -21447,7 +19515,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -21524,11 +19591,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @28
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @34
         class B @46
@@ -21536,17 +19601,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @65
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @67
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -21562,7 +19624,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -21664,11 +19725,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @29
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @33
         class B @54
@@ -21679,7 +19738,6 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {K: T2, V: T1}
@@ -21688,17 +19746,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
           methods
             m @123
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @125
   classes
     abstract class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         K
         V
@@ -21717,7 +19772,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     abstract class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T1
         T2
@@ -21730,7 +19784,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       constructors
         synthetic new
@@ -21816,26 +19869,21 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A1::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A1
           methods
             _foo @38
               reference: <testLibraryFragment>::@class::A1::@method::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A1
         class A2 @59
           reference: <testLibraryFragment>::@class::A2
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A2::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A2
               superConstructor: <testLibraryFragment>::@class::A1::@constructor::new
           methods
             _foo @77
               reference: <testLibraryFragment>::@class::A2::@method::_foo
-              enclosingFragment: <testLibraryFragment>::@class::A2
   classes
     class A1
       reference: <testLibraryFragment>::@class::A1
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A1
       constructors
         synthetic new
@@ -21847,7 +19895,6 @@
           firstFragment: <testLibraryFragment>::@class::A1::@method::_foo
     class A2
       reference: <testLibraryFragment>::@class::A2
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A2
       supertype: A1
       constructors
@@ -21923,11 +19970,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @25
         class B @39
@@ -21935,17 +19980,14 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @67
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @69
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -21961,7 +20003,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       supertype: Object
       constructors
@@ -22072,11 +20113,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @24
         class B @38
@@ -22086,11 +20125,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @49
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @55
         class C @69
@@ -22098,20 +20135,17 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: ConstructorMember
                 base: <testLibraryFragment>::@class::A::@constructor::new
                 substitution: {K: int, V: String}
           methods
             m @119
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @121
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       typeParameters
         K
         V
@@ -22130,7 +20164,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       typeParameters
         T
       firstFragment: <testLibraryFragment>::@class::B
@@ -22148,7 +20181,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::m
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A<int, String>
       constructors
@@ -22247,11 +20279,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::A
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::A
               parameters
                 a @25
         class B @39
@@ -22259,11 +20289,9 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::B
           methods
             m @52
               reference: <testLibraryFragment>::@class::B::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::B
               parameters
                 a @58
         class C @72
@@ -22271,18 +20299,15 @@
           constructors
             synthetic new @-1
               reference: <testLibraryFragment>::@class::C::@constructor::new
-              enclosingFragment: <testLibraryFragment>::@class::C
               superConstructor: <testLibraryFragment>::@class::A::@constructor::new
           methods
             m @101
               reference: <testLibraryFragment>::@class::C::@method::m
-              enclosingFragment: <testLibraryFragment>::@class::C
               parameters
                 a @103
   classes
     class A
       reference: <testLibraryFragment>::@class::A
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::A
       constructors
         synthetic new
@@ -22298,7 +20323,6 @@
           firstFragment: <testLibraryFragment>::@class::A::@method::m
     class B
       reference: <testLibraryFragment>::@class::B
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::B
       constructors
         synthetic new
@@ -22314,7 +20338,6 @@
           firstFragment: <testLibraryFragment>::@class::B::@method::m
     class C
       reference: <testLibraryFragment>::@class::C
-      enclosingElement2: <testLibrary>
       firstFragment: <testLibraryFragment>::@class::C
       supertype: A
       constructors