diff --git a/working/macros/example/README.md b/working/macros/example/README.md
index 10db94cedd..1014313447 100644
--- a/working/macros/example/README.md
+++ b/working/macros/example/README.md
@@ -1,8 +1,6 @@
 **DISCLAIMER**: All code in this package is experimental and should be treated
-as such.
-
-This package some example macros (under `lib`), as well as some utilities to try
-actually running those examples.
+as such. The examples are unstable and may or may not work at any given time,
+depending on the implementation status.
 
 ## Setup
 
@@ -10,6 +8,13 @@ Your SDK will need to match roughly the commit pinned in the pubspec.yaml file
 of this package (see the `ref` lines). Otherwise you will get a kernel version
 mismatch.
 
+## Examples
+
+The example macros live under `lib/` and there are programs using them under
+`bin/`. To try and run an example, you need to enable the `macros` experiment,
+`dart --enable-experiment=macros <script>`, but the implementations do not yet
+support all the examples here so you should expect errors.
+
 ## Benchmarks
 
 There is a basic benchmark at `benchmark/simple.dart`. You can run this tool
@@ -19,12 +24,3 @@ environment (compiler).
 
 This benchmark uses a synthetic program, and only benchmarks the overhead of
 running the macro itself, and the communication to and from the host program.
-
-## Examples
-
-There is an example program at `bin/user_main.dart`. This _cannot_ be directly
-executed but you can compile and execute it with the `bin/run.dart` script.
-
-**NOTE**: This is not meant to be a representative example of how a script using
-macros would be compiled and ran in the real world, but it does allow you to
-execute the program.
diff --git a/working/macros/example/analysis_options.yaml b/working/macros/example/analysis_options.yaml
index 8230812993..da6ac88ac7 100644
--- a/working/macros/example/analysis_options.yaml
+++ b/working/macros/example/analysis_options.yaml
@@ -7,6 +7,5 @@ analyzer:
     # TODO: remove these when the analyzer supports macros enough to run them
     - bin/checks_main.dart
     - bin/injectable_main.dart
-    - bin/user_main.dart
     - bin/json_serializable_main.dart
     - bin/observable_main.dart
diff --git a/working/macros/example/bin/auto_dispose_main.dart b/working/macros/example/bin/auto_dispose_main.dart
new file mode 100644
index 0000000000..2b88ff8890
--- /dev/null
+++ b/working/macros/example/bin/auto_dispose_main.dart
@@ -0,0 +1,41 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:macro_proposal/auto_dispose.dart';
+
+void main() {
+  var state = MyState(a: ADisposable(), b: BDisposable(), c: 'hello world');
+  state.dispose();
+}
+
+@AutoDispose()
+class MyState extends State {
+  final ADisposable a;
+  final ADisposable? a2;
+  final BDisposable b;
+  final String c;
+
+  MyState({required this.a, this.a2, required this.b, required this.c});
+
+  @override
+  String toString() => 'MyState!';
+}
+
+class State {
+  void dispose() {
+    print('disposing of $this');
+  }
+}
+
+class ADisposable implements Disposable {
+  void dispose() {
+    print('disposing of ADisposable');
+  }
+}
+
+class BDisposable implements Disposable {
+  void dispose() {
+    print('disposing of BDisposable');
+  }
+}
diff --git a/working/macros/example/bin/checks_main.dart b/working/macros/example/bin/checks_main.dart
index a91c36292d..8d5f13a987 100644
--- a/working/macros/example/bin/checks_main.dart
+++ b/working/macros/example/bin/checks_main.dart
@@ -1,3 +1,7 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 @ChecksExtensions([Person])
 library;
 
diff --git a/working/macros/example/bin/data_class_main.dart b/working/macros/example/bin/data_class_main.dart
new file mode 100644
index 0000000000..2bbc77075b
--- /dev/null
+++ b/working/macros/example/bin/data_class_main.dart
@@ -0,0 +1,25 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:macro_proposal/data_class.dart';
+
+void main() {
+  var joe = User(age: 25, name: 'Joe', username: 'joe1234');
+  print(joe);
+
+  var phoenix = joe.copyWith(name: 'Phoenix', age: 23);
+  print(phoenix);
+}
+
+@DataClass()
+class User {
+  final int age;
+  final String name;
+  final String username;
+}
+
+@DataClass()
+class Manager extends User {
+  final List<User> reports;
+}
diff --git a/working/macros/example/bin/injectable_main.dart b/working/macros/example/bin/injectable_main.dart
index 80ef6001d4..ecee8e935d 100644
--- a/working/macros/example/bin/injectable_main.dart
+++ b/working/macros/example/bin/injectable_main.dart
@@ -1,3 +1,7 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 import 'package:macro_proposal/injectable.dart';
 
 void main() {
diff --git a/working/macros/example/bin/observable_main.dart b/working/macros/example/bin/observable_main.dart
index 1e59943538..6cac9abf49 100644
--- a/working/macros/example/bin/observable_main.dart
+++ b/working/macros/example/bin/observable_main.dart
@@ -1,3 +1,7 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 import 'package:macro_proposal/observable.dart';
 
 void main() {
@@ -16,6 +20,6 @@ class ObservableUser {
   ObservableUser({
     required int age,
     required String name,
-  }) : _age = age,
-       _name = name;
+  })  : _age = age,
+        _name = name;
 }
diff --git a/working/macros/example/bin/run.dart b/working/macros/example/bin/run.dart
deleted file mode 100644
index c31014ec23..0000000000
--- a/working/macros/example/bin/run.dart
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'dart:io';
-import 'dart:isolate';
-
-import 'package:_fe_analyzer_shared/src/macros/bootstrap.dart';
-import 'package:_fe_analyzer_shared/src/macros/executor/serialization.dart';
-import 'package:frontend_server/compute_kernel.dart';
-
-void main(List<String> args) async {
-  var scriptUri = Uri.base
-      .resolve(args.isEmpty ? 'bin/user_main.dart' : args.single)
-      .toFilePath();
-  watch.start();
-  var dartToolDir = Directory('.dart_tool/macro_proposal')
-    ..createSync(recursive: true);
-  var bootstrapFile =
-      File(dartToolDir.uri.resolve('bootstrap.dart').toFilePath());
-  log('Bootstrapping macro program (${bootstrapFile.path}).');
-  var dataClassUri = Uri.parse('package:macro_proposal/data_class.dart');
-  var functionalWidgetUri =
-      Uri.parse('package:macro_proposal/functional_widget.dart');
-  var observableUri = Uri.parse('package:macro_proposal/observable.dart');
-  var autoDisposableUri = Uri.parse('package:macro_proposal/auto_dispose.dart');
-  var jsonSerializableUri =
-      Uri.parse('package:macro_proposal/json_serializable.dart');
-  var injectableUri = Uri.parse('package:macro_proposal/injectable.dart');
-  var checksExtensionsUri =
-      Uri.parse('package:macro_proposal/checks_extensions.dart');
-  var bootstrapContent = bootstrapMacroIsolate({
-    dataClassUri.toString(): {
-      'AutoConstructor': [''],
-      'CopyWith': [''],
-      'DataClass': [''],
-      'HashCode': [''],
-      'ToString': [''],
-    },
-    functionalWidgetUri.toString(): {
-      'FunctionalWidget': [''],
-    },
-    observableUri.toString(): {
-      'Observable': [''],
-    },
-    autoDisposableUri.toString(): {
-      'AutoDispose': [''],
-    },
-    jsonSerializableUri.toString(): {
-      'JsonSerializable': [''],
-    },
-    injectableUri.toString(): {
-      'Component': [''],
-      'Injectable': [''],
-      'Provides': [''],
-    },
-    checksExtensionsUri.toString(): {
-      'ChecksExtensions': [''],
-      'ChecksExtension': [''],
-    },
-  }, SerializationMode.byteData);
-  bootstrapFile.writeAsStringSync(bootstrapContent);
-  var bootstrapKernelFile =
-      File(bootstrapFile.uri.resolve('bootstrap.dart.dill').toFilePath());
-
-  var feAnalyzerSharedRoot = (await Isolate.resolvePackageUri(
-          Uri.parse('package:_fe_analyzer_shared/fake.dart')))!
-      .resolve('./');
-
-  log('Compiling macro program to kernel (${bootstrapKernelFile.path})');
-  var dataClassSnapshot = await computeKernel([
-    '--enable-experiment=macros',
-    '--no-summary',
-    '--no-summary-only',
-    '--target=vm',
-    '--dart-sdk-summary',
-    Uri.base
-        .resolve(Platform.resolvedExecutable)
-        .resolve('../lib/_internal/vm_platform_strong_product.dill')
-        .toFilePath(),
-    '--output',
-    bootstrapKernelFile.path,
-    '--source=${bootstrapFile.path}',
-    '--source=lib/auto_dispose.dart',
-    '--source=lib/checks_extensions.dart',
-    '--source=lib/data_class.dart',
-    '--source=lib/functional_widget.dart',
-    '--source=lib/injectable.dart',
-    '--source=lib/json_serializable.dart',
-    '--source=lib/observable.dart',
-    for (var source in await _allSources(feAnalyzerSharedRoot.path))
-      '--source=$source',
-    '--packages-file=.dart_tool/package_config.json',
-  ]);
-  if (!dataClassSnapshot.succeeded) {
-    log('failed to build data class macro!');
-    return;
-  }
-
-  var output = File(dartToolDir.uri.resolve('user_main.dill').toFilePath());
-  log('Building main program to kernel (${output.path})');
-  var snapshotResult = await computeKernel([
-    '--enable-experiment=macros',
-    '--no-summary',
-    '--no-summary-only',
-    '--target=vm',
-    '--dart-sdk-summary',
-    Uri.base
-        .resolve(Platform.resolvedExecutable)
-        .resolve('../lib/_internal/vm_platform_strong_product.dill')
-        .toFilePath(),
-    '--output',
-    output.path,
-    '--source',
-    scriptUri,
-    '--packages-file=.dart_tool/package_config.json',
-    '--enable-experiment=macros',
-    '--precompiled-macro',
-    '${bootstrapKernelFile.path};$autoDisposableUri;$dataClassUri;'
-        '$observableUri;$jsonSerializableUri;$injectableUri;'
-        '$checksExtensionsUri',
-    '--macro-serialization-mode=bytedata',
-    '--input-linked',
-    bootstrapKernelFile.path,
-  ]);
-  if (!snapshotResult.succeeded) {
-    log('failed to build!');
-    return;
-  }
-  log('Compiled app, attempting to run:');
-
-  var result = await Process.run(Platform.resolvedExecutable, [output.path]);
-  log('''
-stdout: ${result.stdout}
-
-stderr: ${result.stderr}
-
-exitCode: ${result.exitCode}
-''');
-}
-
-Iterable<String> _allSources(String packageRoot) => Directory(packageRoot)
-    .listSync(recursive: true)
-    .whereType<File>()
-    .map((e) => e.path)
-    .where((path) => path.endsWith('.dart'));
-
-final watch = Stopwatch();
-
-void log(String message) {
-  print('${watch.elapsed}: $message');
-}
diff --git a/working/macros/example/bin/user_main.dart b/working/macros/example/bin/user_main.dart
deleted file mode 100644
index 42af9f5f97..0000000000
--- a/working/macros/example/bin/user_main.dart
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'dart:math';
-
-import 'package:macro_proposal/auto_dispose.dart';
-import 'package:macro_proposal/data_class.dart';
-import 'package:macro_proposal/observable.dart';
-import 'package:macro_proposal/json_serializable.dart';
-
-void main() {
-  var rand = Random();
-  var rogerJson = {
-    'age': rand.nextInt(100),
-    'name': 'Roger',
-    'username': 'roger1337'
-  };
-  var roger = User.fromJson(rogerJson);
-  print(roger);
-  var joe = Manager.gen(
-      age: rand.nextInt(100),
-      name: 'Joe',
-      username: 'joe1234',
-      reports: [roger]);
-  print(joe);
-
-  var phoenix =
-      joe.copyWith(name: 'Phoenix', age: rand.nextInt(100), reports: [joe]);
-  print(phoenix);
-
-  var observableUser = ObservableUser(age: 10, name: 'Georgio');
-  observableUser
-    ..age = 11
-    ..name = 'Greg';
-
-  var state = MyState.gen(a: ADisposable(), b: BDisposable(), c: 'hello world');
-  state.dispose();
-
-  var father = Father.fromJson({
-    'age': roger.age + 25,
-    'name': 'Rogers Dad',
-    'username': 'dadJokesAreCool123',
-    'child': rogerJson,
-  });
-  print(father);
-}
-
-@DataClass()
-@JsonSerializable()
-class User {
-  final int age;
-  final String name;
-  final String username;
-}
-
-@DataClass()
-class Manager extends User {
-  final List<User> reports;
-}
-
-class ObservableUser {
-  @Observable()
-  int _age;
-
-  @Observable()
-  String _name;
-
-  ObservableUser({
-    required int age,
-    required String name,
-  })  : _age = age,
-        _name = name;
-}
-
-// TODO: remove @AutoConstructor once we can, today it is required.
-@AutoConstructor()
-class State {
-  void dispose() {
-    print('disposing of State $this');
-  }
-}
-
-@AutoDispose()
-@AutoConstructor()
-class MyState extends State {
-  final ADisposable a;
-  final ADisposable? a2;
-  final BDisposable b;
-  final String c;
-}
-
-class ADisposable implements Disposable {
-  void dispose() {
-    print('disposing of ADisposable');
-  }
-}
-
-class BDisposable implements Disposable {
-  void dispose() {
-    print('disposing of BDisposable');
-  }
-}
-
-@DataClass()
-@JsonSerializable()
-class Father implements User {
-  final int age;
-  final String name;
-  final String username;
-  final User child;
-}
diff --git a/working/macros/example/lib/auto_dispose.dart b/working/macros/example/lib/auto_dispose.dart
index 9278a1ccef..6ce8a754c2 100644
--- a/working/macros/example/lib/auto_dispose.dart
+++ b/working/macros/example/lib/auto_dispose.dart
@@ -23,6 +23,7 @@ macro class AutoDispose implements ClassDeclarationsMacro, ClassDefinitionMacro
     }
 
     builder.declareInType(DeclarationCode.fromParts([
+      // TODO: Remove external once the CFE supports it.
       'external void dispose();',
     ]));
   }
@@ -62,7 +63,10 @@ macro class AutoDispose implements ClassDeclarationsMacro, ClassDefinitionMacro
     var disposeBuilder = await builder.buildMethod(disposeMethod.identifier);
     disposeBuilder.augment(FunctionBodyCode.fromParts([
       '{\n',
-      if (!disposeMethod.hasBody) 'super.dispose();' else 'augmented();',
+      if (disposeMethod.hasExternal || !disposeMethod.hasBody)
+        'super.dispose();'
+      else
+        'augmented();',
       ...disposeCalls,
       '}',
     ]));
diff --git a/working/macros/example/lib/data_class.dart b/working/macros/example/lib/data_class.dart
index 7a64f57b39..8bf74399dd 100644
--- a/working/macros/example/lib/data_class.dart
+++ b/working/macros/example/lib/data_class.dart
@@ -39,7 +39,7 @@ macro class AutoConstructor implements ClassDeclarationsMacro {
   Future<void> buildDeclarationsForClass(
       ClassDeclaration clazz, MemberDeclarationBuilder builder) async {
     var constructors = await builder.constructorsOf(clazz);
-    if (constructors.any((c) => c.identifier.name == 'gen')) {
+    if (constructors.any((c) => c.identifier.name == '')) {
       throw ArgumentError(
           'Cannot generate an unnamed constructor because one already exists');
     }
@@ -68,7 +68,7 @@ macro class AutoConstructor implements ClassDeclarationsMacro {
     MethodDeclaration? superconstructor;
     if (superType != null && (await superType.isExactly(objectType)) == false) {
       superconstructor = (await builder.constructorsOf(superclass!))
-          .firstWhereOrNull((c) => c.identifier.name == 'gen');
+          .firstWhereOrNull((c) => c.identifier.name == '');
       if (superconstructor == null) {
         throw ArgumentError(
             'Super class $superclass of $clazz does not have an unnamed '
@@ -96,16 +96,16 @@ macro class AutoConstructor implements ClassDeclarationsMacro {
 
     bool hasParams = params.isNotEmpty;
     List<Object> parts = [
-    // Don't use the identifier here because it should just be the raw name.
+      // Don't use the identifier here because it should just be the raw name.
       clazz.identifier.name,
-      '.gen(',
+      '(',
       if (hasParams) '{',
       ...params,
       if (hasParams) '}',
       ')',
     ];
     if (superconstructor != null) {
-      parts.addAll([' : super.', superconstructor.identifier.name, '(']);
+      parts.addAll([' : super(']);
       for (var param in superconstructor.positionalParameters) {
         parts.add('\n${param.identifier.name},');
       }
@@ -158,7 +158,7 @@ macro class CopyWith implements ClassDeclarationsMacro {
       if (hasParams) '}',
       ')',
       // TODO: We assume this constructor exists, but should check
-      '=> ', clazz.identifier, '.gen(',
+      '=> ', clazz.identifier, '(',
       ...args.joinAsCode(', '),
       ');',
     ]));