diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart
index f2762f0eb2..2adcdfd6d1 100644
--- a/lib/src/generator/templates.runtime_renderers.dart
+++ b/lib/src/generator/templates.runtime_renderers.dart
@@ -14390,7 +14390,7 @@ class _Renderer_TopLevelContainer extends RendererBase<TopLevelContainer> {
                   renderVariable: (CT_ c, Property<CT_> self,
                           List<String> remainingNames) =>
                       self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<TopLevelVariable>'),
+                          c, remainingNames, 'List<TopLevelVariable>'),
                   renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
                     return c.publicConstantsSorted.map((e) =>
diff --git a/lib/src/model/container.dart b/lib/src/model/container.dart
index 448cf4a734..f6bea689b1 100644
--- a/lib/src/model/container.dart
+++ b/lib/src/model/container.dart
@@ -97,7 +97,7 @@ abstract class Container extends ModelElement
   @nonVirtual
   bool get hasPublicInstanceMethods => instanceMethods.any((e) => e.isPublic);
 
-  late final List<Method> publicInstanceMethodsSorted =
+  List<Method> get publicInstanceMethodsSorted =>
       instanceMethods.wherePublic.toList(growable: false)..sort();
 
   @nonVirtual
@@ -113,7 +113,7 @@ abstract class Container extends ModelElement
   bool get hasPublicInstanceOperators =>
       instanceOperators.any((e) => e.isPublic);
 
-  late final List<Operator> publicInstanceOperatorsSorted =
+  List<Operator> get publicInstanceOperatorsSorted =>
       instanceOperators.wherePublic.toList(growable: false)..sort();
 
   /// Fields fully declared in this [Container].
@@ -128,14 +128,14 @@ abstract class Container extends ModelElement
   @nonVirtual
   bool get hasPublicInstanceFields => instanceFields.any((e) => e.isPublic);
 
-  late final List<Field> publicInstanceFieldsSorted =
+  List<Field> get publicInstanceFieldsSorted =>
       instanceFields.wherePublic.toList(growable: false)..sort(byName);
 
   Iterable<Field> get constantFields => declaredFields.where((f) => f.isConst);
 
   bool get hasPublicConstantFields => constantFields.any((e) => e.isPublic);
 
-  late final List<Field> publicConstantFieldsSorted =
+  List<Field> get publicConstantFieldsSorted =>
       constantFields.wherePublic.toList(growable: false)..sort(byName);
 
   /// The total list of public enum values.
@@ -194,7 +194,7 @@ abstract class Container extends ModelElement
 
   bool get hasPublicStaticFields => staticFields.any((e) => e.isPublic);
 
-  late final List<Field> publicStaticFieldsSorted =
+  List<Field> get publicStaticFieldsSorted =>
       staticFields.wherePublic.toList(growable: false)..sort();
 
   Iterable<Field> get staticFields => declaredFields.where((f) => f.isStatic);
@@ -205,7 +205,7 @@ abstract class Container extends ModelElement
   bool get hasPublicVariableStaticFields =>
       variableStaticFields.any((e) => e.isPublic);
 
-  late final List<Field> publicVariableStaticFieldsSorted =
+  List<Field> get publicVariableStaticFieldsSorted =>
       variableStaticFields.wherePublic.toList(growable: false)..sort();
 
   Iterable<Method> get staticMethods =>
@@ -213,7 +213,7 @@ abstract class Container extends ModelElement
 
   bool get hasPublicStaticMethods => staticMethods.any((e) => e.isPublic);
 
-  late final List<Method> publicStaticMethodsSorted =
+  List<Method> get publicStaticMethodsSorted =>
       staticMethods.wherePublic.toList(growable: false)..sort();
 
   /// For subclasses to add items after the main pass but before the
diff --git a/lib/src/model/top_level_container.dart b/lib/src/model/top_level_container.dart
index c8f817d377..7eff3ad86a 100644
--- a/lib/src/model/top_level_container.dart
+++ b/lib/src/model/top_level_container.dart
@@ -55,33 +55,33 @@ mixin TopLevelContainer implements Nameable {
   // TODO(jcollins-g):  Setting this type parameter to `Container` magically
   // fixes a number of type problems in the AOT compiler, but I am mystified as
   // to why that should be the case.
-  late final List<Container> publicClassesSorted =
+  List<Container> get publicClassesSorted =>
       classes.wherePublic.toList(growable: false)..sort();
 
-  late final List<Extension> publicExtensionsSorted =
+  List<Extension> get publicExtensionsSorted =>
       extensions.wherePublic.toList(growable: false)..sort();
 
-  late final List<ExtensionType> publicExtensionTypesSorted =
+  List<ExtensionType> get publicExtensionTypesSorted =>
       extensionTypes.wherePublic.toList(growable: false)..sort();
 
-  Iterable<TopLevelVariable> get publicConstantsSorted =>
+  List<TopLevelVariable> get publicConstantsSorted =>
       constants.wherePublic.toList(growable: false)..sort();
 
-  late final List<Enum> publicEnumsSorted =
+  List<Enum> get publicEnumsSorted =>
       enums.wherePublic.toList(growable: false)..sort();
 
-  late final List<Class> publicExceptionsSorted =
+  List<Class> get publicExceptionsSorted =>
       exceptions.wherePublic.toList(growable: false)..sort();
 
-  late final List<ModelFunctionTyped> publicFunctionsSorted =
+  List<ModelFunctionTyped> get publicFunctionsSorted =>
       functions.wherePublic.toList(growable: false)..sort();
 
-  late final List<Mixin> publicMixinsSorted =
+  List<Mixin> get publicMixinsSorted =>
       mixins.wherePublic.toList(growable: false)..sort();
 
-  late final List<TopLevelVariable> publicPropertiesSorted =
+  List<TopLevelVariable> get publicPropertiesSorted =>
       properties.wherePublic.toList(growable: false)..sort();
 
-  late final List<Typedef> publicTypedefsSorted =
+  List<Typedef> get publicTypedefsSorted =>
       typedefs.wherePublic.toList(growable: false)..sort();
 }